| From 2a4a115a97661af08f99a97b12a9f8476e011ee4 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?J=C3=BCrg=20Billeter?= <j@bitron.ch> |
| Date: Tue, 24 Jun 2014 04:19:50 +0200 |
| Subject: gpio: rcar: clamp returned value to [0,1] |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| While it will be clamped to bool by gpiolib, let's make this sane |
| in the driver as well. |
| |
| Signed-off-by: Jürg Billeter <j@bitron.ch> |
| Signed-off-by: Linus Walleij <linus.walleij@linaro.org> |
| (cherry picked from commit 7cb5409b10d9f8316ca2539591acb6a5f7fd4139) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/gpio/gpio-rcar.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c |
| index b6ae89ea8811..0d251dc7643d 100644 |
| --- a/drivers/gpio/gpio-rcar.c |
| +++ b/drivers/gpio/gpio-rcar.c |
| @@ -240,9 +240,9 @@ static int gpio_rcar_get(struct gpio_chip *chip, unsigned offset) |
| /* testing on r8a7790 shows that INDT does not show correct pin state |
| * when configured as output, so use OUTDT in case of output pins */ |
| if (gpio_rcar_read(gpio_to_priv(chip), INOUTSEL) & bit) |
| - return (int)(gpio_rcar_read(gpio_to_priv(chip), OUTDT) & bit); |
| + return !!(gpio_rcar_read(gpio_to_priv(chip), OUTDT) & bit); |
| else |
| - return (int)(gpio_rcar_read(gpio_to_priv(chip), INDT) & bit); |
| + return !!(gpio_rcar_read(gpio_to_priv(chip), INDT) & bit); |
| } |
| |
| static void gpio_rcar_set(struct gpio_chip *chip, unsigned offset, int value) |
| -- |
| 2.1.2 |
| |
