summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorCorentin Chary <corentincj@iksaif.net>2011-02-06 13:28:40 +0100
committerMatthew Garrett <mjg@redhat.com>2011-03-28 06:05:18 -0400
commitc14d4b8ea799515cd44134b8eddd8f789f0b6286 (patch)
treec30ea7806c60ed429f5e42675228b75ed091e12d /drivers
parentb71872650fe967eb0a38aa0d7dcbe9c60d160032 (diff)
eeepc-wmi: respect wireless_hotplug setting
Signed-off-by: Corentin Chary <corentincj@iksaif.net> Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/platform/x86/eeepc-wmi.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/platform/x86/eeepc-wmi.c b/drivers/platform/x86/eeepc-wmi.c
index 910eb00fb13..bc713334567 100644
--- a/drivers/platform/x86/eeepc-wmi.c
+++ b/drivers/platform/x86/eeepc-wmi.c
@@ -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 -