Merge branch 'thinkpad' into release

b963bd39 · Len Brown · cbeee135 · 5f0dadb4 · b963bd39
Commit b963bd39 authored Sep 19, 2009 by Len Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

drivers/platform/x86/thinkpad_acpi.c drivers/platform/x86/thinkpad_acpi.c +1 -0

No files found.
--- 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);
 	}