diff options
author | Andi Kleen <ak@linux.intel.com> | 2008-09-04 08:41:02 -0400 |
---|---|---|
committer | Andi Kleen <ak@linux.intel.com> | 2008-09-04 08:41:02 -0400 |
commit | 5ed459102d1e914972d65dd4ea9f26073143a4e9 (patch) | |
tree | 60223a29b992330c13a427fd63925f161537e62c /drivers | |
parent | 4fd23436f1f414fea9a1a6050d4ed6de02cb91e5 (diff) | |
parent | 7d964c352b06aabb895e39d3b479e105bd9d1ca0 (diff) |
Merge branch 'wmi-fix' into release-2.6.27
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/misc/acer-wmi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/misc/acer-wmi.c b/drivers/misc/acer-wmi.c index b2d9878dc3f0..8290f67570c0 100644 --- a/drivers/misc/acer-wmi.c +++ b/drivers/misc/acer-wmi.c | |||
@@ -1186,7 +1186,7 @@ static int create_debugfs(void) | |||
1186 | return 0; | 1186 | return 0; |
1187 | 1187 | ||
1188 | error_debugfs: | 1188 | error_debugfs: |
1189 | remove_debugfs(); | 1189 | remove_debugfs(); |
1190 | return -ENOMEM; | 1190 | return -ENOMEM; |
1191 | } | 1191 | } |
1192 | 1192 | ||
@@ -1267,6 +1267,7 @@ error_platform_register: | |||
1267 | static void __exit acer_wmi_exit(void) | 1267 | static void __exit acer_wmi_exit(void) |
1268 | { | 1268 | { |
1269 | remove_sysfs(acer_platform_device); | 1269 | remove_sysfs(acer_platform_device); |
1270 | remove_debugfs(); | ||
1270 | platform_device_del(acer_platform_device); | 1271 | platform_device_del(acer_platform_device); |
1271 | platform_driver_unregister(&acer_platform_driver); | 1272 | platform_driver_unregister(&acer_platform_driver); |
1272 | 1273 | ||