fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / leds / led-class.c

diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
index d424b44..3c17112 100644 (file)
--- a/drivers/leds/led-class.c
+++ b/drivers/leds/led-class.c
@@ -91,6 +91,8 @@ EXPORT_SYMBOL_GPL(led_classdev_resume);
  */
 int led_classdev_register(struct device *parent, struct led_classdev *led_cdev)
 {
+       int rc;
+
        led_cdev->class_dev = class_device_create(leds_class, NULL, 0,
                                                parent, "%s", led_cdev->name);
        if (unlikely(IS_ERR(led_cdev->class_dev)))
@@ -99,8 +101,10 @@ int led_classdev_register(struct device *parent, struct led_classdev *led_cdev)
        class_set_devdata(led_cdev->class_dev, led_cdev);
 
        /* register the attributes */
-       class_device_create_file(led_cdev->class_dev,
-                               &class_device_attr_brightness);
+       rc = class_device_create_file(led_cdev->class_dev,
+                                     &class_device_attr_brightness);
+       if (rc)
+               goto err_out;
 
        /* add to the list of leds */
        write_lock(&leds_list_lock);
@@ -110,22 +114,34 @@ int led_classdev_register(struct device *parent, struct led_classdev *led_cdev)
 #ifdef CONFIG_LEDS_TRIGGERS
        rwlock_init(&led_cdev->trigger_lock);
 
-       led_trigger_set_default(led_cdev);
+       rc = class_device_create_file(led_cdev->class_dev,
+                                     &class_device_attr_trigger);
+       if (rc)
+               goto err_out_led_list;
 
-       class_device_create_file(led_cdev->class_dev,
-                               &class_device_attr_trigger);
+       led_trigger_set_default(led_cdev);
 #endif
 
        printk(KERN_INFO "Registered led device: %s\n",
                        led_cdev->class_dev->class_id);
 
        return 0;
+
+#ifdef CONFIG_LEDS_TRIGGERS
+err_out_led_list:
+       class_device_remove_file(led_cdev->class_dev,
+                               &class_device_attr_brightness);
+       list_del(&led_cdev->node);
+#endif
+err_out:
+       class_device_unregister(led_cdev->class_dev);
+       return rc;
 }
 EXPORT_SYMBOL_GPL(led_classdev_register);
 
 /**
  * led_classdev_unregister - unregisters a object of led_properties class.
- * @led_cdev: the led device to unreigister
+ * @led_cdev: the led device to unregister
  *
  * Unregisters a previously registered via led_classdev_register object.
  */