aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-09-19 02:11:06 -0400
committerLen Brown <len.brown@intel.com>2009-09-19 02:11:06 -0400
commitb963bd39c9000328f6ce4f12aa52abbb0c68ee91 (patch)
tree1c4b1d5ed3c568903d3734173a3f08ad6741e351 /drivers
parentcbeee13570adfb0af494a07074958e4888c2351c (diff)
parent5f0dadb4bd259c3b832e19702f552947244edfb9 (diff)
Merge branch 'thinkpad' into release
Diffstat (limited to 'drivers')
-rw-r--r--drivers/platform/x86/thinkpad_acpi.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 955adf67e8f..f78d2750392 100644
--- 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)
1278 tp_rfk = tpacpi_rfkill_switches[id]; 1278 tp_rfk = tpacpi_rfkill_switches[id];
1279 if (tp_rfk) { 1279 if (tp_rfk) {
1280 rfkill_unregister(tp_rfk->rfkill); 1280 rfkill_unregister(tp_rfk->rfkill);
1281 rfkill_destroy(tp_rfk->rfkill);
1281 tpacpi_rfkill_switches[id] = NULL; 1282 tpacpi_rfkill_switches[id] = NULL;
1282 kfree(tp_rfk); 1283 kfree(tp_rfk);
1283 } 1284 }