| From 60bc25ae16f65871a78b6dbd42a048c6395f2a85 Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert+renesas@glider.be> |
| Date: Wed, 27 Nov 2019 10:59:19 +0100 |
| Subject: [PATCH] gpio: Fix error message on out-of-range GPIO in lookup table |
| |
| commit d935bd50dd14a7714cbdba9a76435dbb56edb1ae upstream. |
| |
| When a GPIO offset in a lookup table is out-of-range, the printed error |
| message (1) does not include the actual out-of-range value, and (2) |
| contains an off-by-one error in the upper bound. |
| |
| Avoid user confusion by also printing the actual GPIO offset, and |
| correcting the upper bound of the range. |
| While at it, use "%u" for unsigned int. |
| |
| Sample impact: |
| |
| -requested GPIO 0 is out of range [0..32] for chip e6052000.gpio |
| +requested GPIO 0 (45) is out of range [0..31] for chip e6052000.gpio |
| |
| Fixes: 2a3cf6a3599e9015 ("gpiolib: return -ENOENT if no GPIO mapping exists") |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| Link: https://lore.kernel.org/r/20191127095919.4214-1-geert+renesas@glider.be |
| Signed-off-by: Linus Walleij <linus.walleij@linaro.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c |
| index cf55ae4c92f7..c3e9d069384a 100644 |
| --- a/drivers/gpio/gpiolib.c |
| +++ b/drivers/gpio/gpiolib.c |
| @@ -3990,8 +3990,9 @@ static struct gpio_desc *gpiod_find(struct device *dev, const char *con_id, |
| |
| if (chip->ngpio <= p->chip_hwnum) { |
| dev_err(dev, |
| - "requested GPIO %d is out of range [0..%d] for chip %s\n", |
| - idx, chip->ngpio, chip->label); |
| + "requested GPIO %u (%u) is out of range [0..%u] for chip %s\n", |
| + idx, p->chip_hwnum, chip->ngpio - 1, |
| + chip->label); |
| return ERR_PTR(-EINVAL); |
| } |
| |
| -- |
| 2.7.4 |
| |
