lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

backlight: Fix error handling

Browse Source 
Fix error handling when registering new device

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
This commit is contained in:
Dmitry Torokhov
2007-02-07 22:25:50 +00:00
committed by Richard Purdie
parent 7a208463b2
commit 2fd5a15489
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/video/backlight/backlight.c
View File

@@ -240,13 +240,16 @@ struct backlight_device *backlight_device_register(const char *name,
rc = class_device_register(&new_bd->class_dev); rc = class_device_register(&new_bd->class_dev);
if (unlikely(rc)) { if (unlikely(rc)) {
error: kfree(new_bd); kfree(new_bd);
return ERR_PTR(rc); return ERR_PTR(rc);
} }
rc = backlight_register_fb(new_bd); rc = backlight_register_fb(new_bd);
if (unlikely(rc)) if (rc) {
goto error; class_device_unregister(&new_bd->class_dev);
return ERR_PTR(rc);
}
for (i = 0; i < ARRAY_SIZE(bl_class_device_attributes); i++) { for (i = 0; i < ARRAY_SIZE(bl_class_device_attributes); i++) {
rc = class_device_create_file(&new_bd->class_dev, rc = class_device_create_file(&new_bd->class_dev,

9
drivers/video/backlight/lcd.c
View File

@@ -206,14 +206,15 @@ struct lcd_device *lcd_device_register(const char *name, void *devdata,
rc = class_device_register(&new_ld->class_dev); rc = class_device_register(&new_ld->class_dev);
if (unlikely(rc)) { if (unlikely(rc)) {
error: kfree(new_ld); kfree(new_ld);
return ERR_PTR(rc); return ERR_PTR(rc);
} }
rc = lcd_register_fb(new_ld); rc = lcd_register_fb(new_ld);
if (rc) {
if (unlikely(rc)) class_device_unregister(&new_ld->class_dev);
goto error; return ERR_PTR(rc);
}
for (i = 0; i < ARRAY_SIZE(lcd_class_device_attributes); i++) { for (i = 0; i < ARRAY_SIZE(lcd_class_device_attributes); i++) {
rc = class_device_create_file(&new_ld->class_dev, rc = class_device_create_file(&new_ld->class_dev,