summaryrefslogtreecommitdiff
path: root/drivers/gpio/gpiolib-of.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2019-11-05 11:00:40 +0100
committerLinus Walleij <linus.walleij@linaro.org>2019-11-05 11:00:40 +0100
commitc196924277ea82200d4c4fd9537c71390b96f247 (patch)
tree2f76c094c3adee9c041e9e89a9431c5c7ef08e85 /drivers/gpio/gpiolib-of.c
parent6a41b6c5fc20abced88fa0eed42ae5e5cb70b280 (diff)
parenta99d8080aaf358d5d23581244e5da23b35e340b9 (diff)
Merge tag 'v5.4-rc6' into devel
Linux 5.4-rc6
Diffstat (limited to 'drivers/gpio/gpiolib-of.c')
-rw-r--r--drivers/gpio/gpiolib-of.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c
index 99adc801a067..0380a1d6b660 100644
--- a/drivers/gpio/gpiolib-of.c
+++ b/drivers/gpio/gpiolib-of.c
@@ -320,7 +320,7 @@ struct gpio_desc *gpiod_get_from_of_node(struct device_node *node,
transitory = flags & OF_GPIO_TRANSITORY;
ret = gpiod_request(desc, label);
- if (ret == -EBUSY && (flags & GPIOD_FLAGS_BIT_NONEXCLUSIVE))
+ if (ret == -EBUSY && (dflags & GPIOD_FLAGS_BIT_NONEXCLUSIVE))
return desc;
if (ret)
return ERR_PTR(ret);