diff options
| author | James Morris <james.l.morris@oracle.com> | 2012-06-10 22:52:10 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2012-06-10 22:52:10 +1000 |
| commit | 66dd07b88a1c9d446f32253da606b87324fa620e (patch) | |
| tree | 4e0971bdd543585c7ab46716ae808a7fd82f9c35 /arch/mips/ath79/dev-leds-gpio.c | |
| parent | f52c44cd27b4a0be37ef97f0466e4095ebebef3f (diff) | |
| parent | cfaf025112d3856637ff34a767ef785ef5cf2ca9 (diff) | |
Merge commit 'v3.5-rc2' into next
Diffstat (limited to 'arch/mips/ath79/dev-leds-gpio.c')
| -rw-r--r-- | arch/mips/ath79/dev-leds-gpio.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/mips/ath79/dev-leds-gpio.c b/arch/mips/ath79/dev-leds-gpio.c index cdade68dcd17..dcb1debcefb8 100644 --- a/arch/mips/ath79/dev-leds-gpio.c +++ b/arch/mips/ath79/dev-leds-gpio.c @@ -24,12 +24,10 @@ void __init ath79_register_leds_gpio(int id, struct gpio_led *p; int err; - p = kmalloc(num_leds * sizeof(*p), GFP_KERNEL); + p = kmemdup(leds, num_leds * sizeof(*p), GFP_KERNEL); if (!p) return; - memcpy(p, leds, num_leds * sizeof(*p)); - pdev = platform_device_alloc("leds-gpio", id); if (!pdev) goto err_free_leds; |