From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-lb0-f170.google.com ([209.85.217.170]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1U11m9-0006DS-Av for barebox@lists.infradead.org; Thu, 31 Jan 2013 21:34:30 +0000 Received: by mail-lb0-f170.google.com with SMTP id ge1so3902542lbb.1 for ; Thu, 31 Jan 2013 13:34:27 -0800 (PST) From: Antony Pavlov Date: Fri, 1 Feb 2013 01:46:34 +0400 Message-Id: <1359668796-22835-4-git-send-email-antonynpavlov@gmail.com> In-Reply-To: <1359668796-22835-1-git-send-email-antonynpavlov@gmail.com> References: <1359668796-22835-1-git-send-email-antonynpavlov@gmail.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: barebox-bounces@lists.infradead.org Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH v2 3/5] gpiolib: gpio_request(): add error message To: barebox@lists.infradead.org Signed-off-by: Antony Pavlov --- drivers/gpio/gpio.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/drivers/gpio/gpio.c b/drivers/gpio/gpio.c index 5876454..179fc7b 100644 --- a/drivers/gpio/gpio.c +++ b/drivers/gpio/gpio.c @@ -29,22 +29,37 @@ int gpio_request(unsigned gpio, const char *label) struct gpio_chip *chip = gi->chip; int ret; - if (!gpio_is_valid(gpio)) - return -EINVAL; - if (!chip) - return -EINVAL; - if (gi->requested) - return -EBUSY; + if (!gpio_is_valid(gpio)) { + ret = -EINVAL; + goto err; + } + + if (!chip) { + ret = -EINVAL; + goto err; + } + + if (gi->requested) { + ret = -EBUSY; + goto err; + } + if (chip->ops->request) { ret = chip->ops->request(chip, gpio - chip->base); if (ret) - return ret; + goto err; } gi->requested = true; gi->label = xstrdup(label); return 0; + +err: + pr_err("can't request gpio %d as %s (%d)\n", + gpio, label, ret); + + return ret; } int gpio_request_input(unsigned gpio, const char *label) -- 1.7.10.4 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox