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

[linux-2.6-block.git] / drivers / platform / x86 / eeepc-laptop.c

diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index e4094b40a2829e44c00187a7ac839c9a6a4b9065..844c2096bde9244c3daaf504892f2bbcefad3db0 100644 (file)
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -964,7 +964,6 @@ static const struct dev_pm_ops eeepc_pm_ops = {
 static struct platform_driver platform_driver = {
        .driver = {
                .name = EEEPC_LAPTOP_FILE,
-               .owner = THIS_MODULE,
                .pm = &eeepc_pm_ops,
        }
 };
@@ -1174,8 +1173,7 @@ static int eeepc_backlight_init(struct eeepc_laptop *eeepc)
 
 static void eeepc_backlight_exit(struct eeepc_laptop *eeepc)
 {
-       if (eeepc->backlight_device)
-               backlight_device_unregister(eeepc->backlight_device);
+       backlight_device_unregister(eeepc->backlight_device);
        eeepc->backlight_device = NULL;
 }