diff options
| author |  Andi Kleen <ak@linux.intel.com>
| 2008-09-04 14:41:02 +0200 |
|---|---|---|
| committer | Andi Kleen <ak@linux.intel.com>
| 2008-09-04 14:41:02 +0200 |
| commit | 5ed459102d1e914972d65dd4ea9f26073143a4e9 (patch) | |
| tree | 60223a29b992330c13a427fd63925f161537e62c /drivers | |
| parent | Merge branches 'smbus' and 'fujitsu-fix' into release-2.6.27 (diff) | |
| parent | acer-wmi: remove debugfs entries upon unloading (diff) | |
| download | linux-5ed459102d1e914972d65dd4ea9f26073143a4e9.tar.gz linux-5ed459102d1e914972d65dd4ea9f26073143a4e9.tar.bz2 linux-5ed459102d1e914972d65dd4ea9f26073143a4e9.zip | |
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) return 0; error_debugfs: - remove_debugfs(); + remove_debugfs(); return -ENOMEM; } @@ -1267,6 +1267,7 @@ error_platform_register: static void __exit acer_wmi_exit(void) { remove_sysfs(acer_platform_device); + remove_debugfs(); platform_device_del(acer_platform_device); platform_driver_unregister(&acer_platform_driver); |