diff options
| author | Mark Brown <broonie@kernel.org> | 2018-12-21 13:43:32 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-12-21 13:43:32 +0000 |
| commit | b27d9668be60d42904b71ab1a9e4d152c7b5c920 (patch) | |
| tree | 62c1b3e52abb5b60cc19a2a772b005e9f00b814b /drivers/gpio/gpiolib.c | |
| parent | 67a2ab931e9f79f516566e69c92e566b71fb20d1 (diff) | |
| parent | cd07e3701fa6a4c68f8493ee1d12caa18d46ec6a (diff) | |
| download | talos-op-linux-b27d9668be60d42904b71ab1a9e4d152c7b5c920.tar.gz talos-op-linux-b27d9668be60d42904b71ab1a9e4d152c7b5c920.zip | |
Merge branch 'regulator-4.21' into regulator-next
Diffstat (limited to 'drivers/gpio/gpiolib.c')
| -rw-r--r-- | drivers/gpio/gpiolib.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index a2cbb474901c..985c09ce80fb 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -4205,6 +4205,8 @@ 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)) + return desc; if (ret) return ERR_PTR(ret); |
