diff options
| author | Corentin Chary <corentincj@iksaif.net> | 2011-02-06 07:28:40 -0500 |
|---|---|---|
| committer | Matthew Garrett <mjg@redhat.com> | 2011-03-28 06:05:18 -0400 |
| commit | c14d4b8ea799515cd44134b8eddd8f789f0b6286 (patch) | |
| tree | c30ea7806c60ed429f5e42675228b75ed091e12d /drivers/platform | |
| parent | b71872650fe967eb0a38aa0d7dcbe9c60d160032 (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/platform')
| -rw-r--r-- | drivers/platform/x86/eeepc-wmi.c | 3 |
1 files changed, 3 insertions, 0 deletions
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) | |||
| 748 | if (result && result != -ENODEV) | 748 | if (result && result != -ENODEV) |
| 749 | goto exit; | 749 | goto exit; |
| 750 | 750 | ||
| 751 | if (!eeepc->hotplug_wireless) | ||
| 752 | goto exit; | ||
| 753 | |||
| 751 | result = eeepc_setup_pci_hotplug(eeepc); | 754 | result = eeepc_setup_pci_hotplug(eeepc); |
| 752 | /* | 755 | /* |
| 753 | * If we get -EBUSY then something else is handling the PCI hotplug - | 756 | * If we get -EBUSY then something else is handling the PCI hotplug - |