Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c
index e5225d28f392..c6e4b772b757 100644
--- a/drivers/leds/leds-gpio.c
+++ b/drivers/leds/leds-gpio.c
@@ -14,6 +14,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/leds.h>
+#include <linux/slab.h>
 #include <linux/workqueue.h>
 
 #include <asm/gpio.h>
@@ -211,7 +212,6 @@ static int __devinit of_gpio_leds_probe(struct of_device *ofdev,
                                         const struct of_device_id *match)
 {
         struct device_node *np = ofdev->node, *child;
-        struct gpio_led led;
         struct gpio_led_of_platform_data *pdata;
         int count = 0, ret;
 
@@ -226,8 +226,8 @@ static int __devinit of_gpio_leds_probe(struct of_device *ofdev,
         if (!pdata)
                 return -ENOMEM;
 
-        memset(&led, 0, sizeof(led));
         for_each_child_of_node(np, child) {
+                struct gpio_led led = {};
                 enum of_gpio_flags flags;
                 const char *state;