2019-11-27 10:01:37

by Geert Uytterhoeven

[permalink] [raw]
Subject: [PATCH] gpiolib: Fix error message on out-of-range GPIO in lookup table

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 <[email protected]>
---
drivers/gpio/gpiolib.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 9913886ede904bb0..dce0b31f4125a6b3 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -4472,8 +4472,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.17.1


2019-11-29 08:21:36

by Linus Walleij

[permalink] [raw]
Subject: Re: [PATCH] gpiolib: Fix error message on out-of-range GPIO in lookup table

On Wed, Nov 27, 2019 at 10:59 AM Geert Uytterhoeven
<[email protected]> wrote:

> 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 <[email protected]>

Patch applied for fixes!

Thanks!
Linus Walleij