git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: lib: delay: align loop
[pandora-kernel.git]
/
arch
/
arm
/
plat-orion
/
gpio.c
diff --git
a/arch/arm/plat-orion/gpio.c
b/arch/arm/plat-orion/gpio.c
index
41ab97e
..
10d1608
100644
(file)
--- a/
arch/arm/plat-orion/gpio.c
+++ b/
arch/arm/plat-orion/gpio.c
@@
-384,12
+384,16
@@
void __init orion_gpio_init(int gpio_base, int ngpio,
struct orion_gpio_chip *ochip;
struct irq_chip_generic *gc;
struct irq_chip_type *ct;
struct orion_gpio_chip *ochip;
struct irq_chip_generic *gc;
struct irq_chip_type *ct;
+ char gc_label[16];
if (orion_gpio_chip_count == ARRAY_SIZE(orion_gpio_chips))
return;
if (orion_gpio_chip_count == ARRAY_SIZE(orion_gpio_chips))
return;
+ snprintf(gc_label, sizeof(gc_label), "orion_gpio%d",
+ orion_gpio_chip_count);
+
ochip = orion_gpio_chips + orion_gpio_chip_count;
ochip = orion_gpio_chips + orion_gpio_chip_count;
- ochip->chip.label =
"orion_gpio"
;
+ ochip->chip.label =
kstrdup(gc_label, GFP_KERNEL)
;
ochip->chip.request = orion_gpio_request;
ochip->chip.direction_input = orion_gpio_direction_input;
ochip->chip.get = orion_gpio_get;
ochip->chip.request = orion_gpio_request;
ochip->chip.direction_input = orion_gpio_direction_input;
ochip->chip.get = orion_gpio_get;