[kernel] update to 2.6.25.12

[openwrt-10.03/.git] / target / linux / generic-2.6 / patches-2.6.25 / 964-backport_gpiolib_fix_off_by_one_errors.patch

diff --git a/target/linux/generic-2.6/patches-2.6.25/964-backport_gpiolib_fix_off_by_one_errors.patch b/target/linux/generic-2.6/patches-2.6.25/964-backport_gpiolib_fix_off_by_one_errors.patch
index 715f9abbbfc9d5de5718f3c0e6b335476007be4f..74d7247ccd5d9bf404de889ac70ef62a4f140c3d 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/964-backport_gpiolib_fix_off_by_one_errors.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/964-backport_gpiolib_fix_off_by_one_errors.patch
@@ -15,11 +15,9 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 ---
 
-diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
-index 7f138c6..beaf6b3 100644
 --- a/drivers/gpio/gpiolib.c
 +++ b/drivers/gpio/gpiolib.c
-@@ -127,7 +127,7 @@ int __init gpiochip_reserve(int start, int ngpio)
+@@ -127,7 +127,7 @@
        unsigned long flags;
        int i;
  
@@ -28,7 +26,7 @@ index 7f138c6..beaf6b3 100644
                return -EINVAL;
  
        spin_lock_irqsave(&gpio_lock, flags);
-@@ -170,7 +170,7 @@ int gpiochip_add(struct gpio_chip *chip)
+@@ -170,7 +170,7 @@
        unsigned        id;
        int             base = chip->base;
  
@@ -37,7 +35,7 @@ index 7f138c6..beaf6b3 100644
                        && base >= 0) {
                status = -EINVAL;
                goto fail;
-@@ -207,7 +207,7 @@ fail:
+@@ -207,7 +207,7 @@
        /* failures here can mean systems won't boot... */
        if (status)
                pr_err("gpiochip_add: gpios %d..%d (%s) not registered\n",