Merge branch 'misc-2.6.32' into release

[sfrench/cifs-2.6.git] / drivers / platform / x86 / hp-wmi.c

diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
index af04f5b049db927a2e40d7248fd98abdc772e8e6..c2842171cec6b9942c3e844954842612d5db0d20 100644 (file)
--- a/drivers/platform/x86/hp-wmi.c
+++ b/drivers/platform/x86/hp-wmi.c
@@ -507,7 +507,7 @@ static int __exit hp_wmi_bios_remove(struct platform_device *device)
        }
        if (bluetooth_rfkill) {
                rfkill_unregister(bluetooth_rfkill);
-               rfkill_destroy(wifi_rfkill);
+               rfkill_destroy(bluetooth_rfkill);
        }
        if (wwan_rfkill) {
                rfkill_unregister(wwan_rfkill);