From 489882208b77a8aaf2dd233f7ae937fe45cbb897 Mon Sep 17 00:00:00 2001 From: Li Dongyang Date: Wed, 25 Jul 2012 10:45:09 +1000 Subject: [PATCH] --- yaml --- r: 319679 b: refs/heads/master c: 00d39597e825a2b09ec88d4dd429ff72fe60d9d4 h: refs/heads/master i: 319677: 55335dae25d78ed617b441c2f8919eec37e26260 319675: e2fb89e7fc753a23fc4c8649d4b01b30ca9bc579 319671: 167d916d4a559a71a47fe1f2034145d40fc1ed1e 319663: 1fc2e68c3a22dec0001897ded2f33fdad92c6c4c 319647: 5174e713e915ef937c44584c1ac61803d88df2c5 319615: e8b10a1c72e977543c873a733a7c2355a0150423 v: v3 --- [refs] | 2 +- trunk/drivers/platform/x86/thinkpad_acpi.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 896da0bf81c0..d082a6ec04d0 100644 --- 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 index ae203558ac90..e7f73287636c 100644 --- 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)