eeepc-wmi: respect wireless_hotplug setting
authorCorentin Chary <corentincj@iksaif.net>
Sun, 6 Feb 2011 12:28:40 +0000 (13:28 +0100)
committerMatthew Garrett <mjg@redhat.com>
Mon, 28 Mar 2011 10:05:18 +0000 (06:05 -0400)
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
drivers/platform/x86/eeepc-wmi.c

index 910eb00fb13ef5093302b7f2ef6d2e135ba3de06..bc7133345674360cb64f6e9992a802ccad4238a8 100644 (file)
@@ -748,6 +748,9 @@ static int eeepc_wmi_rfkill_init(struct eeepc_wmi *eeepc)
        if (result && result != -ENODEV)
                goto exit;
 
+       if (!eeepc->hotplug_wireless)
+               goto exit;
+
        result = eeepc_setup_pci_hotplug(eeepc);
        /*
         * If we get -EBUSY then something else is handling the PCI hotplug -