---

yaml --- r: 319679 b: refs/heads/master c: 00d3959 h: refs/heads/master i: 319677: 55335da 319675: e2fb89e 319671: 167d916 319663: 1fc2e68 319647: 5174e71 319615: e8b10a1 v: v3
git-mirror · Jul 28, 2012 · 4898822 · 4898822
1 parent 248c443
commit 4898822
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2be15bdda45b184d483754e434c9a1c8ed80a8e
+refs/heads/master: 00d39597e825a2b09ec88d4dd429ff72fe60d9d4
diff --git a/trunk/drivers/platform/x86/thinkpad_acpi.c b/trunk/drivers/platform/x86/thinkpad_acpi.c
@@ -3015,8 +3015,6 @@ static void hotkey_exit(void)
 	if (hotkey_dev_attributes)
 		delete_attr_set(hotkey_dev_attributes, &tpacpi_pdev->dev.kobj);
 
-	kfree(hotkey_keycode_map);
-
 	dbg_printk(TPACPI_DBG_EXIT | TPACPI_DBG_HKEY,
 		   "restoring original HKEY status and mask\n");
 	/* yes, there is a bitwise or below, we want the
@@ -8937,6 +8935,7 @@ static void thinkpad_acpi_module_exit(void)
 			input_unregister_device(tpacpi_inputdev);
 		else
 			input_free_device(tpacpi_inputdev);
+		kfree(hotkey_keycode_map);
 	}
 
 	if (tpacpi_hwmon)