From: Corentin Chary <corentincj@iksaif.net>
Date: Sun, 6 Feb 2011 12:28:40 +0000 (+0100)
Subject: eeepc-wmi: respect wireless_hotplug setting
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=c14d4b8ea799515cd44134b8eddd8f789f0b6286;p=deliverable%2Flinux.git

eeepc-wmi: respect wireless_hotplug setting

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
---

diff --git a/drivers/platform/x86/eeepc-wmi.c b/drivers/platform/x86/eeepc-wmi.c
index 910eb00fb13e..bc7133345674 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 -