Merge tag 'platform-drivers-x86-v3.19-1' of git://git.infradead.org/users/dvhart...

[deliverable/linux.git] / drivers / platform / x86 / asus-laptop.c

diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
index 7f4dc6f51f8afdf9df7984818585e10bf2047280..f71700e0d13212cb3a93701d939c9fced2b0f6ca 100644 (file)
--- a/drivers/platform/x86/asus-laptop.c
+++ b/drivers/platform/x86/asus-laptop.c
@@ -843,8 +843,7 @@ static int asus_backlight_init(struct asus_laptop *asus)
 
 static void asus_backlight_exit(struct asus_laptop *asus)
 {
-       if (asus->backlight_device)
-               backlight_device_unregister(asus->backlight_device);
+       backlight_device_unregister(asus->backlight_device);
        asus->backlight_device = NULL;
 }
 
@@ -1699,7 +1698,6 @@ static void asus_platform_exit(struct asus_laptop *asus)
 static struct platform_driver platform_driver = {
        .driver = {
                .name = ASUS_LAPTOP_FILE,
-               .owner = THIS_MODULE,
        },
 };