Commit 3b55cb88 authored by Linus Walleij's avatar Linus Walleij

Merge tag 'gpio-5.1-rc2-fixes-for-linus' of...

Merge tag 'gpio-5.1-rc2-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into fixes

GPIO fixes for v5.1-rc2

- check the return value of a function that can fail in gpio-exar
- fix the SPDX identifier in amd-fch
- fix the direction_input callback in gpio-adnp
parents 9e98c678 b45a02e1
...@@ -132,8 +132,10 @@ static int adnp_gpio_direction_input(struct gpio_chip *chip, unsigned offset) ...@@ -132,8 +132,10 @@ static int adnp_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
if (err < 0) if (err < 0)
goto out; goto out;
if (err & BIT(pos)) if (value & BIT(pos)) {
err = -EACCES; err = -EPERM;
goto out;
}
err = 0; err = 0;
......
...@@ -148,6 +148,8 @@ static int gpio_exar_probe(struct platform_device *pdev) ...@@ -148,6 +148,8 @@ static int gpio_exar_probe(struct platform_device *pdev)
mutex_init(&exar_gpio->lock); mutex_init(&exar_gpio->lock);
index = ida_simple_get(&ida_index, 0, 0, GFP_KERNEL); index = ida_simple_get(&ida_index, 0, 0, GFP_KERNEL);
if (index < 0)
goto err_destroy;
sprintf(exar_gpio->name, "exar_gpio%d", index); sprintf(exar_gpio->name, "exar_gpio%d", index);
exar_gpio->gpio_chip.label = exar_gpio->name; exar_gpio->gpio_chip.label = exar_gpio->name;
......
/* SPDX-License-Identifier: GPL+ */ /* SPDX-License-Identifier: GPL-2.0+ */
/* /*
* AMD FCH gpio driver platform-data * AMD FCH gpio driver platform-data
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment