summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2019-03-11 21:29:37 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-04-03 06:26:27 +0200
commit6ebe03734361063f665fb3b2478406abedd8eb04 (patch)
treed0dfe92d4cd830e7006e698252d8e0de34d85eda
parentb26f7e86d3cc0e8744cf198118e313911f20f1f6 (diff)
downloadlinux-rpi3-6ebe03734361063f665fb3b2478406abedd8eb04.tar.gz
linux-rpi3-6ebe03734361063f665fb3b2478406abedd8eb04.tar.bz2
linux-rpi3-6ebe03734361063f665fb3b2478406abedd8eb04.zip
gpio: adnp: Fix testing wrong value in adnp_gpio_direction_input
commit c5bc6e526d3f217ed2cc3681d256dc4a2af4cc2b upstream. Current code test wrong value so it does not verify if the written data is correctly read back. Fix it. Also make it return -EPERM if read value does not match written bit, just like it done for adnp_gpio_direction_output(). Fixes: 5e969a401a01 ("gpio: Add Avionic Design N-bit GPIO expander support") Cc: <stable@vger.kernel.org> Signed-off-by: Axel Lin <axel.lin@ingics.com> Reviewed-by: Thierry Reding <thierry.reding@gmail.com> Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/gpio/gpio-adnp.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-adnp.c b/drivers/gpio/gpio-adnp.c
index 91b90c0cea73..12acdac85820 100644
--- a/drivers/gpio/gpio-adnp.c
+++ b/drivers/gpio/gpio-adnp.c
@@ -132,8 +132,10 @@ static int adnp_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
if (err < 0)
goto out;
- if (err & BIT(pos))
- err = -EACCES;
+ if (value & BIT(pos)) {
+ err = -EPERM;
+ goto out;
+ }
err = 0;