From 974425bc3c1ba8900c53da2e9637ff625d889c7d Mon Sep 17 00:00:00 2001 From: "Lee, Chun-Yi" Date: Sat, 15 May 2010 06:18:54 +0800 Subject: [PATCH] --- yaml --- r: 197565 b: refs/heads/master c: 7ab52521f2d850e922f33e5586a47e6c83ec6f11 h: refs/heads/master i: 197563: 2f69d1013d64feef5661c097d4639f732b2cfaef v: v3 --- [refs] | 2 +- trunk/drivers/platform/x86/msi-laptop.c | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5c63030fd7f2..a29858cb965d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ac34072bda53e889ac1c5a73ea59f42a769485a +refs/heads/master: 7ab52521f2d850e922f33e5586a47e6c83ec6f11 diff --git a/trunk/drivers/platform/x86/msi-laptop.c b/trunk/drivers/platform/x86/msi-laptop.c index 5822d0ac68d2..704b5faac599 100644 --- a/trunk/drivers/platform/x86/msi-laptop.c +++ b/trunk/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 @@ static int __init msi_init(void) 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);