diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-12-30 13:17:07 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-12-30 17:27:20 +0300 |
| commit | 7ebdfaa52d15b947503f76474477f92854796d96 (patch) | |
| tree | 27cd7acfcd264e8d643db86185f9e3a33a5cf367 /drivers/platform/x86/fujitsu-laptop.c | |
| parent | d6ad36913083d683aad4e02e53580c995f1a6ede (diff) | |
| parent | d4b0833a65e8b9fc58d992ba0cc89cad1580db31 (diff) | |
| download | linux-7ebdfaa52d15b947503f76474477f92854796d96.tar.xz | |
Merge tag 'mvebu-fixes-3.19' of git://git.infradead.org/linux-mvebu into fixes
Pull "Fixes for 3.19" from Andrew Lunn:
Jason is taking a back seat this cycle and i'm doing all the patch
wrangling for mvebu.
* tag 'mvebu-fixes-3.19' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: Fix pinctrl configuration for Armada 370 DB
Also update to Linux 3.19-rc1, which this was based on.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/platform/x86/fujitsu-laptop.c')
| -rw-r--r-- | drivers/platform/x86/fujitsu-laptop.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index 2655d4a988f3..7c21c1c44dfa 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c @@ -559,7 +559,6 @@ static struct attribute_group fujitsupf_attribute_group = { static struct platform_driver fujitsupf_driver = { .driver = { .name = "fujitsu-laptop", - .owner = THIS_MODULE, } }; @@ -1154,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); @@ -1179,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); |