summaryrefslogtreecommitdiffstats
path: root/drivers/gpio/gpiolib.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2016-02-22 13:44:53 +0100
committerLinus Walleij <linus.walleij@linaro.org>2016-02-22 13:44:53 +0100
commit9d8cc89c316d9cc8ff269068ac8f904f13b5a70d (patch)
treef6efe1eafa20feff5ec79fc15cf2ce295022e778 /drivers/gpio/gpiolib.c
parentRevert "gpio: remove broken irq_to_gpio() interface" (diff)
downloadlinux-9d8cc89c316d9cc8ff269068ac8f904f13b5a70d.tar.xz
linux-9d8cc89c316d9cc8ff269068ac8f904f13b5a70d.zip
gpio: fixup line flags for userspace ABI
This fixes the wrongly indicated lines in the userspace ABI: test for the right BITS, do not treat bit numbers as bitmasks. Reported-by: Markus Pargmann <mpa@pengutronix.de> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio/gpiolib.c')
-rw-r--r--drivers/gpio/gpiolib.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index b81646982375..872774a404f1 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -380,17 +380,19 @@ static long gpio_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
* this GPIO so it can't use it.
*/
lineinfo.flags = 0;
- if (desc->flags & (FLAG_REQUESTED | FLAG_IS_HOGGED |
- FLAG_USED_AS_IRQ | FLAG_EXPORT |
- FLAG_SYSFS))
+ if (test_bit(FLAG_REQUESTED, &desc->flags) ||
+ test_bit(FLAG_IS_HOGGED, &desc->flags) ||
+ test_bit(FLAG_USED_AS_IRQ, &desc->flags) ||
+ test_bit(FLAG_EXPORT, &desc->flags) ||
+ test_bit(FLAG_SYSFS, &desc->flags))
lineinfo.flags |= GPIOLINE_FLAG_KERNEL;
- if (desc->flags & FLAG_IS_OUT)
+ if (test_bit(FLAG_IS_OUT, &desc->flags))
lineinfo.flags |= GPIOLINE_FLAG_IS_OUT;
- if (desc->flags & FLAG_ACTIVE_LOW)
+ if (test_bit(FLAG_ACTIVE_LOW, &desc->flags))
lineinfo.flags |= GPIOLINE_FLAG_ACTIVE_LOW;
- if (desc->flags & FLAG_OPEN_DRAIN)
+ if (test_bit(FLAG_OPEN_DRAIN, &desc->flags))
lineinfo.flags |= GPIOLINE_FLAG_OPEN_DRAIN;
- if (desc->flags & FLAG_OPEN_SOURCE)
+ if (test_bit(FLAG_OPEN_SOURCE, &desc->flags))
lineinfo.flags |= GPIOLINE_FLAG_OPEN_SOURCE;
if (copy_to_user(ip, &lineinfo, sizeof(lineinfo)))