Merge branch 'wmi-fix' into release-2.6.27

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 @@ static int __init acer_wmi_init(void)
 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);