Merge branch 'wmi-fix' into release-2.6.27

This commit is contained in:
Andi Kleen 2008-09-04 14:41:02 +02:00
commit 5ed459102d
1 changed files with 2 additions and 1 deletions

View File

@ -1186,7 +1186,7 @@ static int create_debugfs(void)
return 0; return 0;
error_debugfs: error_debugfs:
remove_debugfs(); remove_debugfs();
return -ENOMEM; return -ENOMEM;
} }
@ -1267,6 +1267,7 @@ static int __init acer_wmi_init(void)
static void __exit acer_wmi_exit(void) static void __exit acer_wmi_exit(void)
{ {
remove_sysfs(acer_platform_device); remove_sysfs(acer_platform_device);
remove_debugfs();
platform_device_del(acer_platform_device); platform_device_del(acer_platform_device);
platform_driver_unregister(&acer_platform_driver); platform_driver_unregister(&acer_platform_driver);