Messages in this thread Patch in this message | | | From | Jose Diaz de Grenu de Pedro <> | Subject | [PATCH v2] gpiolib: return 0 or 1 in gpiod_get_value*() functions | Date | Mon, 30 Nov 2015 18:30:31 +0100 |
| |
Commit 79a9becda894 moved the awareness of active low state into the gpiod_get_value*() functions, but it only inverts the GPIO's raw value when it is active low. If the GPIO is active high, the gpiod_get_value*() functions return the raw value of the register, which can be any positive value.
This patch does a double inversion when the GPIO is active high to make sure either 0 or 1 is returned by these functions.
Signed-off-by: Jose Diaz de Grenu de Pedro <Jose.DiazdeGrenudePedro@digi.com> Signed-off-by: Hector Palacios <hector.palacios@digi.com> --- change in v2: - add missing semicolon --- drivers/gpio/gpiolib.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 50c4922fe53a..bd96f0457ba8 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1981,9 +1981,9 @@ int gpiod_get_value(const struct gpio_desc *desc) value = _gpiod_get_raw_value(desc); if (test_bit(FLAG_ACTIVE_LOW, &desc->flags)) - value = !value; - - return value; + return !value; + else + return !!value; } EXPORT_SYMBOL_GPL(gpiod_get_value); @@ -2224,9 +2224,9 @@ int gpiod_get_value_cansleep(const struct gpio_desc *desc) value = _gpiod_get_raw_value(desc); if (test_bit(FLAG_ACTIVE_LOW, &desc->flags)) - value = !value; - - return value; + return !value; + else + return !!value; } EXPORT_SYMBOL_GPL(gpiod_get_value_cansleep); -- 2.6.3
| |