diff options
| author | Joel Stanley <joel@jms.id.au> | 2019-03-25 10:19:01 +1030 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2019-03-25 10:19:05 +1030 |
| commit | 8b3439b5b1608d580628af573000faa7d7db4b48 (patch) | |
| tree | db80ecdedd265f28c317149db5a1624c7497894e /drivers/mfd | |
| parent | b94b74e8b52db91fe4e99e0bb481ec8bf2b5b47c (diff) | |
| parent | 239cc2c5a3c8555efd2330cc5b09affd5b503669 (diff) | |
| download | blackbird-obmc-linux-8b3439b5b1608d580628af573000faa7d7db4b48.tar.gz blackbird-obmc-linux-8b3439b5b1608d580628af573000faa7d7db4b48.zip | |
Merge tag 'v5.0.4' into dev-5.0
This is the 5.0.4 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/sm501.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c index a530972c5a7e..e0173bf4b0dc 100644 --- a/drivers/mfd/sm501.c +++ b/drivers/mfd/sm501.c @@ -1145,6 +1145,9 @@ static int sm501_register_gpio_i2c_instance(struct sm501_devdata *sm, lookup = devm_kzalloc(&pdev->dev, sizeof(*lookup) + 3 * sizeof(struct gpiod_lookup), GFP_KERNEL); + if (!lookup) + return -ENOMEM; + lookup->dev_id = "i2c-gpio"; if (iic->pin_sda < 32) lookup->table[0].chip_label = "SM501-LOW"; |
