diff options
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.25/960-backport_gpiolib_better_rmmod_infrastructure.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.25/960-backport_gpiolib_better_rmmod_infrastructure.patch | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.25/960-backport_gpiolib_better_rmmod_infrastructure.patch b/target/linux/generic-2.6/patches-2.6.25/960-backport_gpiolib_better_rmmod_infrastructure.patch index a6822fc14..f41b01453 100644 --- a/target/linux/generic-2.6/patches-2.6.25/960-backport_gpiolib_better_rmmod_infrastructure.patch +++ b/target/linux/generic-2.6/patches-2.6.25/960-backport_gpiolib_better_rmmod_infrastructure.patch @@ -22,11 +22,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 d8db2f8..eb75d12 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c -@@ -68,6 +68,9 @@ static void gpio_ensure_requested(struct gpio_desc *desc) +@@ -68,6 +68,9 @@ if (test_and_set_bit(FLAG_REQUESTED, &desc->flags) == 0) { pr_warning("GPIO-%d autorequested\n", (int)(desc - gpio_desc)); desc_set_label(desc, "[auto]"); @@ -36,7 +34,7 @@ index d8db2f8..eb75d12 100644 } } -@@ -177,6 +180,9 @@ int gpio_request(unsigned gpio, const char *label) +@@ -177,6 +180,9 @@ if (desc->chip == NULL) goto done; @@ -46,7 +44,7 @@ index d8db2f8..eb75d12 100644 /* NOTE: gpio_request() can be called in early boot, * before IRQs are enabled. */ -@@ -184,8 +190,10 @@ int gpio_request(unsigned gpio, const char *label) +@@ -184,8 +190,10 @@ if (test_and_set_bit(FLAG_REQUESTED, &desc->flags) == 0) { desc_set_label(desc, label ? : "?"); status = 0; @@ -58,7 +56,7 @@ index d8db2f8..eb75d12 100644 done: if (status) -@@ -209,9 +217,10 @@ void gpio_free(unsigned gpio) +@@ -209,9 +217,10 @@ spin_lock_irqsave(&gpio_lock, flags); desc = &gpio_desc[gpio]; @@ -71,8 +69,6 @@ index d8db2f8..eb75d12 100644 WARN_ON(extra_checks); spin_unlock_irqrestore(&gpio_lock, flags); -diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h -index f29a502..7e77b6f 100644 --- a/include/asm-generic/gpio.h +++ b/include/asm-generic/gpio.h @@ -17,6 +17,7 @@ @@ -83,7 +79,7 @@ index f29a502..7e77b6f 100644 /** * struct gpio_chip - abstract a GPIO controller -@@ -48,6 +49,7 @@ struct seq_file; +@@ -48,6 +49,7 @@ */ struct gpio_chip { char *label; |