Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next

1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
index b3c54be74556..559a40861c39 100644
--- a/drivers/leds/led-class.c
+++ b/drivers/leds/led-class.c
@@ -103,13 +103,11 @@ int led_classdev_register(struct device *parent, struct led_classdev *led_cdev)
 {
         int rc;
 
-        led_cdev->dev = device_create(leds_class, parent, 0, "%s",
-                                            led_cdev->name);
+        led_cdev->dev = device_create_drvdata(leds_class, parent, 0, led_cdev,
+                                              "%s", led_cdev->name);
         if (IS_ERR(led_cdev->dev))
                 return PTR_ERR(led_cdev->dev);
 
-        dev_set_drvdata(led_cdev->dev, led_cdev);
-
         /* register the attributes */
         rc = device_create_file(led_cdev->dev, &dev_attr_brightness);
         if (rc)