diff options
| author | Mark Brown <broonie@kernel.org> | 2019-07-04 17:34:32 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-07-04 17:34:32 +0100 |
| commit | 65244e5b1f4fade54b490b47b871cefe1d7d07f0 (patch) | |
| tree | 7474acf605cd0ddb2cb3ca62cc4b41494a049105 /drivers/gpio | |
| parent | f0386617dca6deaca241a01efb9a579d0d727e7f (diff) | |
| parent | 3c7577d442a76c2015dd765497395fb394b78051 (diff) | |
Merge branch 'regulator-5.3' into regulator-next
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/gpiolib.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index e013d417a936..be1d1d2f8aaa 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -4244,8 +4244,7 @@ EXPORT_SYMBOL_GPL(gpiod_get_index); * * Returns: * On successful request the GPIO pin is configured in accordance with - * provided @dflags. If the node does not have the requested GPIO - * property, NULL is returned. + * provided @dflags. * * In case of error an ERR_PTR() is returned. */ @@ -4267,9 +4266,6 @@ struct gpio_desc *gpiod_get_from_of_node(struct device_node *node, index, &flags); if (!desc || IS_ERR(desc)) { - /* If it is not there, just return NULL */ - if (PTR_ERR(desc) == -ENOENT) - return NULL; return desc; } |