summaryrefslogtreecommitdiffstats
path: root/drivers/mfd/tps65010.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2015-12-22 15:48:13 +0100
committerLee Jones <lee.jones@linaro.org>2016-01-14 08:43:13 +0000
commitbf3de47f1af3dab8fb8c3a3bd21ada7de614b7de (patch)
tree91bca3f986531669bcfab864ec59bbd5c0121c49 /drivers/mfd/tps65010.c
parent0c7f3f92ffe8dc4e631b2f20c06543ec9f521f7c (diff)
downloadlinux-bf3de47f1af3dab8fb8c3a3bd21ada7de614b7de.tar.gz
linux-bf3de47f1af3dab8fb8c3a3bd21ada7de614b7de.tar.bz2
linux-bf3de47f1af3dab8fb8c3a3bd21ada7de614b7de.zip
mfd: tps65010: 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. This also start to propagate the negative error code from the smbus call if there is one, as the last commit of this series will make the gpiolib core deal with that properly. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/tps65010.c')
-rw-r--r--drivers/mfd/tps65010.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/tps65010.c b/drivers/mfd/tps65010.c
index 448f0a182dc4..677a127619d4 100644
--- a/drivers/mfd/tps65010.c
+++ b/drivers/mfd/tps65010.c
@@ -499,11 +499,11 @@ static int tps65010_gpio_get(struct gpio_chip *chip, unsigned offset)
if (offset < 4) {
value = i2c_smbus_read_byte_data(tps->client, TPS_DEFGPIO);
if (value < 0)
- return 0;
+ return value;
if (value & (1 << (offset + 4))) /* output */
return !(value & (1 << offset));
else /* input */
- return (value & (1 << offset));
+ return !!(value & (1 << offset));
}
/* REVISIT we *could* report LED1/nPG and LED2 state ... */