diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2016-02-22 13:47:49 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2016-02-22 13:47:49 +0100 |
| commit | 3cf42efc3479806bc5db5176fd440d23bb73854b (patch) | |
| tree | a6a0a57cbe89a4f779625f8ce6e8ebc7ea49f2c0 /arch/powerpc/sysdev/ppc4xx_gpio.c | |
| parent | 6ec9249a83b00a754af435ed57ad02ffed105d93 (diff) | |
| parent | 9d8cc89c316d9cc8ff269068ac8f904f13b5a70d (diff) | |
| download | linux-3cf42efc3479806bc5db5176fd440d23bb73854b.tar.bz2 | |
Merge branch 'devel' into for-next
Diffstat (limited to 'arch/powerpc/sysdev/ppc4xx_gpio.c')
| -rw-r--r-- | arch/powerpc/sysdev/ppc4xx_gpio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/ppc4xx_gpio.c b/arch/powerpc/sysdev/ppc4xx_gpio.c index fc65ad1b3293..d7a7ef135b9f 100644 --- a/arch/powerpc/sysdev/ppc4xx_gpio.c +++ b/arch/powerpc/sysdev/ppc4xx_gpio.c @@ -78,7 +78,7 @@ static int ppc4xx_gpio_get(struct gpio_chip *gc, unsigned int gpio) struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc); struct ppc4xx_gpio __iomem *regs = mm_gc->regs; - return in_be32(®s->ir) & GPIO_MASK(gpio); + return !!(in_be32(®s->ir) & GPIO_MASK(gpio)); } static inline void |