projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b718726
)
eeepc-wmi: respect wireless_hotplug setting
author
Corentin Chary
<corentincj@iksaif.net>
Sun, 6 Feb 2011 12:28:40 +0000
(13:28 +0100)
committer
Matthew 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
patch
|
blob
|
history
diff --git
a/drivers/platform/x86/eeepc-wmi.c
b/drivers/platform/x86/eeepc-wmi.c
index
910eb00
..
bc71333
100644
(file)
--- 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 -