Merge branch 'thinkpad' into release

2009-09-19 02:11:06 -04:00 · 2009-09-19 02:11:06 -04:00 · b963bd39c9
parent cbeee13570 5f0dadb4bd
commit b963bd39c9
1 changed files with 1 additions and 0 deletions
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@ -1278,6 +1278,7 @@ static void tpacpi_destroy_rfkill(const enum tpacpi_rfk_id id)
 	tp_rfk = tpacpi_rfkill_switches[id];
 	if (tp_rfk) {
 		rfkill_unregister(tp_rfk->rfkill);
+		rfkill_destroy(tp_rfk->rfkill);
 		tpacpi_rfkill_switches[id] = NULL;
 		kfree(tp_rfk);
 	}