forked from Minki/linux
gpiolib: fix off by one errors
The last gpio belonging to a chip is chip->base + chip->ngpios - 1. Some places in the code, but not all, forgot the critical minus one. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Acked-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
1d1c1d9b55
commit
bff5fda972
@ -127,7 +127,7 @@ int __init gpiochip_reserve(int start, int ngpio)
|
|||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (!gpio_is_valid(start) || !gpio_is_valid(start + ngpio))
|
if (!gpio_is_valid(start) || !gpio_is_valid(start + ngpio - 1))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
spin_lock_irqsave(&gpio_lock, flags);
|
spin_lock_irqsave(&gpio_lock, flags);
|
||||||
@ -170,7 +170,7 @@ int gpiochip_add(struct gpio_chip *chip)
|
|||||||
unsigned id;
|
unsigned id;
|
||||||
int base = chip->base;
|
int base = chip->base;
|
||||||
|
|
||||||
if ((!gpio_is_valid(base) || !gpio_is_valid(base + chip->ngpio))
|
if ((!gpio_is_valid(base) || !gpio_is_valid(base + chip->ngpio - 1))
|
||||||
&& base >= 0) {
|
&& base >= 0) {
|
||||||
status = -EINVAL;
|
status = -EINVAL;
|
||||||
goto fail;
|
goto fail;
|
||||||
@ -207,7 +207,7 @@ fail:
|
|||||||
/* failures here can mean systems won't boot... */
|
/* failures here can mean systems won't boot... */
|
||||||
if (status)
|
if (status)
|
||||||
pr_err("gpiochip_add: gpios %d..%d (%s) not registered\n",
|
pr_err("gpiochip_add: gpios %d..%d (%s) not registered\n",
|
||||||
chip->base, chip->base + chip->ngpio,
|
chip->base, chip->base + chip->ngpio - 1,
|
||||||
chip->label ? : "generic");
|
chip->label ? : "generic");
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user