From 0fdc446cfdb310201501e05cf268639621722df7 Mon Sep 17 00:00:00 2001 From: Corentin Chary Date: Sun, 6 Feb 2011 13:28:40 +0100 Subject: [PATCH] --- yaml --- r: 243073 b: refs/heads/master c: c14d4b8ea799515cd44134b8eddd8f789f0b6286 h: refs/heads/master i: 243071: f66158cbb298407745e32a12d3dfaba967b9d819 v: v3 --- [refs] | 2 +- trunk/drivers/platform/x86/eeepc-wmi.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index aedf0995bf9b..8fbd73969d83 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b71872650fe967eb0a38aa0d7dcbe9c60d160032 +refs/heads/master: c14d4b8ea799515cd44134b8eddd8f789f0b6286 diff --git a/trunk/drivers/platform/x86/eeepc-wmi.c b/trunk/drivers/platform/x86/eeepc-wmi.c index 910eb00fb13e..bc7133345674 100644 --- a/trunk/drivers/platform/x86/eeepc-wmi.c +++ b/trunk/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 -