diff options
| author | Antony Pavlov <antonynpavlov@gmail.com> | 2014-01-09 21:58:37 +0400 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-01-10 10:09:31 +0100 |
| commit | f8cdb92751c6508e4ba1cb4d4ad8baee5cd2ab2e (patch) | |
| tree | cd18624fb6ba1063cbb369313fc5e1e3b1bf47d6 /drivers/gpio | |
| parent | d95f27aaa83381ce210d3b285ad2647ce0313bbb (diff) | |
| download | barebox-f8cdb92751c6508e4ba1cb4d4ad8baee5cd2ab2e.tar.gz barebox-f8cdb92751c6508e4ba1cb4d4ad8baee5cd2ab2e.tar.xz | |
gpiolib: gpio_request(): print message on error
Just copy gpiod_request() function logic from linux-v3.13-rc7.
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/gpiolib.c | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index cafef907ef..b7430b01ac 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -50,22 +50,33 @@ int gpio_request(unsigned gpio, const char *label) struct gpio_info *gi = gpio_to_desc(gpio); int ret; - if (!gi) - return -ENODEV; + if (!gi) { + ret = -ENODEV; + goto done; + } - if (gi->requested) - return -EBUSY; + if (gi->requested) { + ret = -EBUSY; + goto done; + } + + ret = 0; if (gi->chip->ops->request) { ret = gi->chip->ops->request(gi->chip, gpio - gi->chip->base); if (ret) - return ret; + goto done; } gi->requested = true; gi->label = xstrdup(label); - return 0; +done: + if (ret) + pr_err("_gpio_request: gpio-%d (%s) status %d\n", + gpio, label ? : "?", ret); + + return ret; } void gpio_free(unsigned gpio) |