2 files changed, 11 insertions, 7 deletions

diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c
index 9601bfe309ac..71056f8b621a 100644
--- a/drivers/video/backlight/backlight.c
+++ b/drivers/video/backlight/backlight.c
@@ -240,13 +240,16 @@ struct backlight_device *backlight_device_register(const char *name,
 
         rc = class_device_register(&new_bd->class_dev);
         if (unlikely(rc)) {
-error:          kfree(new_bd);
+                kfree(new_bd);
                 return ERR_PTR(rc);
         }
 
         rc = backlight_register_fb(new_bd);
-        if (unlikely(rc))
-                goto error;
+        if (rc) {
+                class_device_unregister(&new_bd->class_dev);
+                return ERR_PTR(rc);
+        }
+
 
         for (i = 0; i < ARRAY_SIZE(bl_class_device_attributes); i++) {
                 rc = class_device_create_file(&new_bd->class_dev,
diff --git a/drivers/video/backlight/lcd.c b/drivers/video/backlight/lcd.c
index f6e041627edb..f95f0e33101d 100644
--- a/drivers/video/backlight/lcd.c
+++ b/drivers/video/backlight/lcd.c
@@ -206,14 +206,15 @@ struct lcd_device *lcd_device_register(const char *name, void *devdata,
 
         rc = class_device_register(&new_ld->class_dev);
         if (unlikely(rc)) {
-error:          kfree(new_ld);
+                kfree(new_ld);
                 return ERR_PTR(rc);
         }
 
         rc = lcd_register_fb(new_ld);
-
-        if (unlikely(rc))
-                goto error;
+        if (rc) {
+                class_device_unregister(&new_ld->class_dev);
+                return ERR_PTR(rc);
+        }
 
         for (i = 0; i < ARRAY_SIZE(lcd_class_device_attributes); i++) {
                 rc = class_device_create_file(&new_ld->class_dev,