diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2016-02-08 15:35:47 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2016-02-08 15:35:47 +0100 |
| commit | daec0beda6fd7a741e4381741b3f7ff15970fdf6 (patch) | |
| tree | d72f83053ac1eea76ed4df35054ba692313c80ce /drivers | |
| parent | 5041e791440a53930f06ce22deeb17a72e343ad0 (diff) | |
| parent | a80bb4c9ec200ab4fc3ad502bf80e00ca5db12a7 (diff) | |
| download | op-kernel-dev-daec0beda6fd7a741e4381741b3f7ff15970fdf6.zip op-kernel-dev-daec0beda6fd7a741e4381741b3f7ff15970fdf6.tar.gz | |
Merge branch 'error-return-from-get' into devel
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/soc/fsl/qe/gpio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/soc/fsl/qe/gpio.c b/drivers/soc/fsl/qe/gpio.c index aa5c11ac..6584571 100644 --- a/drivers/soc/fsl/qe/gpio.c +++ b/drivers/soc/fsl/qe/gpio.c @@ -63,7 +63,7 @@ static int qe_gpio_get(struct gpio_chip *gc, unsigned int gpio) struct qe_pio_regs __iomem *regs = mm_gc->regs; u32 pin_mask = 1 << (QE_PIO_PINS - 1 - gpio); - return in_be32(®s->cpdata) & pin_mask; + return !!(in_be32(®s->cpdata) & pin_mask); } static void qe_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val) |
