Merge tag 'for-linus-2' of git://git.code.sf.net/p/openipmi/linux-ipmi

[cascardo/linux.git] / drivers / platform / x86 / fujitsu-laptop.c

diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
index be55bd7..7c21c1c 100644 (file)
--- a/drivers/platform/x86/fujitsu-laptop.c
+++ b/drivers/platform/x86/fujitsu-laptop.c
@@ -1153,8 +1153,7 @@ fail_hotkey1:
 fail_hotkey:
        platform_driver_unregister(&fujitsupf_driver);
 fail_backlight:
-       if (fujitsu->bl_device)
-               backlight_device_unregister(fujitsu->bl_device);
+       backlight_device_unregister(fujitsu->bl_device);
 fail_sysfs_group:
        sysfs_remove_group(&fujitsu->pf_device->dev.kobj,
                           &fujitsupf_attribute_group);
@@ -1178,8 +1177,7 @@ static void __exit fujitsu_cleanup(void)
 
        platform_driver_unregister(&fujitsupf_driver);
 
-       if (fujitsu->bl_device)
-               backlight_device_unregister(fujitsu->bl_device);
+       backlight_device_unregister(fujitsu->bl_device);
 
        sysfs_remove_group(&fujitsu->pf_device->dev.kobj,
                           &fujitsupf_attribute_group);