diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2021-10-29 17:04:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-10-29 17:04:38 -0700 |
| commit | db2398a56aecec058643d35828e8cca56a0ac0a3 (patch) | |
| tree | 646fe50bb9971d180a8dd6571e936027ae5cfaf4 /drivers | |
| parent | Merge tag 'block-5.15-2021-10-29' of git://git.kernel.dk/linux-block (diff) | |
| parent | gpio: mlxbf2.c: Add check for bgpio_init failure (diff) | |
| download | linux-dev-db2398a56aecec058643d35828e8cca56a0ac0a3.tar.xz linux-dev-db2398a56aecec058643d35828e8cca56a0ac0a3.zip | |
Merge tag 'gpio-fixes-for-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux
Pull gpio fixes from Bartosz Golaszewski:
- fix the return value check when parsing the ngpios property in
gpio-xgs-iproc
- check the return value of bgpio_init() in gpio-mlxbf2
* tag 'gpio-fixes-for-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
gpio: mlxbf2.c: Add check for bgpio_init failure
gpio: xgs-iproc: fix parsing of ngpios property
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpio/gpio-mlxbf2.c | 5 | ||||
| -rw-r--r-- | drivers/gpio/gpio-xgs-iproc.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-mlxbf2.c b/drivers/gpio/gpio-mlxbf2.c index 177d03ef4529..40a052bc6784 100644 --- a/drivers/gpio/gpio-mlxbf2.c +++ b/drivers/gpio/gpio-mlxbf2.c @@ -256,6 +256,11 @@ mlxbf2_gpio_probe(struct platform_device *pdev) NULL, 0); + if (ret) { + dev_err(dev, "bgpio_init failed\n"); + return ret; + } + gc->direction_input = mlxbf2_gpio_direction_input; gc->direction_output = mlxbf2_gpio_direction_output; gc->ngpio = npins; diff --git a/drivers/gpio/gpio-xgs-iproc.c b/drivers/gpio/gpio-xgs-iproc.c index fa9b4d8c3ff5..43ca52fa6f9a 100644 --- a/drivers/gpio/gpio-xgs-iproc.c +++ b/drivers/gpio/gpio-xgs-iproc.c @@ -224,7 +224,7 @@ static int iproc_gpio_probe(struct platform_device *pdev) } chip->gc.label = dev_name(dev); - if (of_property_read_u32(dn, "ngpios", &num_gpios)) + if (!of_property_read_u32(dn, "ngpios", &num_gpios)) chip->gc.ngpio = num_gpios; irq = platform_get_irq(pdev, 0); |