From f8cdb92751c6508e4ba1cb4d4ad8baee5cd2ab2e Mon Sep 17 00:00:00 2001 From: Antony Pavlov Date: Thu, 9 Jan 2014 21:58:37 +0400 Subject: gpiolib: gpio_request(): print message on error Just copy gpiod_request() function logic from linux-v3.13-rc7. Signed-off-by: Antony Pavlov Signed-off-by: Sascha Hauer --- drivers/gpio/gpiolib.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'drivers/gpio') 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) -- cgit v1.2.3