You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
47 lines
1.6 KiB
Diff
47 lines
1.6 KiB
Diff
From: Trent Piepho <xyzzy@speakeasy.org>
|
|
Date: Fri, 23 May 2008 20:04:44 +0000 (-0700)
|
|
Subject: gpiolib: fix off by one errors
|
|
X-Git-Tag: v2.6.26-rc4~31
|
|
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=bff5fda972dc23bd1806a47c2098ae173585d013
|
|
|
|
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>
|
|
---
|
|
|
|
--- a/drivers/gpio/gpiolib.c
|
|
+++ b/drivers/gpio/gpiolib.c
|
|
@@ -127,7 +127,7 @@ int __init gpiochip_reserve(int start, i
|
|
unsigned long flags;
|
|
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;
|
|
|
|
spin_lock_irqsave(&gpio_lock, flags);
|
|
@@ -170,7 +170,7 @@ int gpiochip_add(struct gpio_chip *chip)
|
|
unsigned id;
|
|
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) {
|
|
status = -EINVAL;
|
|
goto fail;
|
|
@@ -207,7 +207,7 @@ fail:
|
|
/* failures here can mean systems won't boot... */
|
|
if (status)
|
|
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");
|
|
return status;
|
|
}
|