summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2015-12-21 11:12:55 +0100
committerLinus Walleij <linus.walleij@linaro.org>2015-12-26 22:28:14 +0100
commitf96600873e368e9fae53c3485972db2252f9f12c (patch)
tree1b63b4e7cda42273111e06cdbec2bf95fe169407
parent2e6d84564c07452ed10a7601484765d37880cc3a (diff)
downloadtalos-obmc-linux-f96600873e368e9fae53c3485972db2252f9f12c.tar.gz
talos-obmc-linux-f96600873e368e9fae53c3485972db2252f9f12c.zip
gpio: max732x: Be sure to clamp return value
As we want gpio_chip .get() calls to be able to return negative error codes and propagate to drivers, we need to go over all drivers and make sure their return values are clamped to [0,1]. We do this by using the ret = !!(val) design pattern. Also start to propagate the error code here as the end of the series fixes this to work for all drivers. Cc: Semen Protsenko <semen.protsenko@globallogic.com> Reviewed-by: Marek Vasut <marex@denx.de> Reviewed-by:Nicholas Krause <xerofoify@gmail.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/gpio/gpio-max732x.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-max732x.c b/drivers/gpio/gpio-max732x.c
index a1094984b666..880ce94e6077 100644
--- a/drivers/gpio/gpio-max732x.c
+++ b/drivers/gpio/gpio-max732x.c
@@ -207,9 +207,9 @@ static int max732x_gpio_get_value(struct gpio_chip *gc, unsigned off)
ret = max732x_readb(chip, is_group_a(chip, off), &reg_val);
if (ret < 0)
- return 0;
+ return ret;
- return reg_val & (1u << (off & 0x7));
+ return !!(reg_val & (1u << (off & 0x7)));
}
static void max732x_gpio_set_mask(struct gpio_chip *gc, unsigned off, int mask,
OpenPOWER on IntegriCloud