diff options
| author | Lee, Chun-Yi <jlee@novell.com> | 2010-05-15 00:18:54 +0200 |
|---|---|---|
| committer | Matthew Garrett <mjg@redhat.com> | 2010-05-20 15:46:12 +0200 |
| commit | 7ab52521f2d850e922f33e5586a47e6c83ec6f11 (patch) | |
| tree | dc7d1d34b534aa7fa92685a4b4c5849916d1228e /drivers/platform | |
| parent | msi-laptop: fix up some coding style issues found by checkpatch (diff) | |
| download | linux-7ab52521f2d850e922f33e5586a47e6c83ec6f11.tar.xz linux-7ab52521f2d850e922f33e5586a47e6c83ec6f11.zip | |
Clean up all objects used by scm model when driver initial fail or exit
Clean up i8042 filter, rfkill and cancel delayed work when msi-laptop driver initial fail or exit on MSI scm model.
Signed-off-by: Lee, Chun-Yi <jlee@novell.com>
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/msi-laptop.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c index 5822d0ac68d2..704b5faac599 100644 --- a/drivers/platform/x86/msi-laptop.c +++ b/drivers/platform/x86/msi-laptop.c @@ -859,6 +859,11 @@ static int __init msi_init(void) fail_platform_device2: + if (load_scm_model) { + i8042_remove_filter(msi_laptop_i8042_filter); + cancel_delayed_work_sync(&msi_rfkill_work); + rfkill_cleanup(); + } platform_device_del(msipf_device); fail_platform_device1: @@ -878,6 +883,11 @@ fail_backlight: static void __exit msi_cleanup(void) { + if (load_scm_model) { + i8042_remove_filter(msi_laptop_i8042_filter); + cancel_delayed_work_sync(&msi_rfkill_work); + rfkill_cleanup(); + } sysfs_remove_group(&msipf_device->dev.kobj, &msipf_attribute_group); if (!old_ec_model && threeg_exists) @@ -886,9 +896,6 @@ static void __exit msi_cleanup(void) platform_driver_unregister(&msipf_driver); backlight_device_unregister(msibl_device); - i8042_remove_filter(msi_laptop_i8042_filter); - rfkill_cleanup(); - /* Enable automatic brightness control again */ if (auto_brightness != 2) set_auto_brightness(1); |