eeepc-laptop: don't touch the pci slot if it was claimed by a different driver

The whole point of registering as a PCI hotplug driver was to prevent
conflict with pciehp.  At the moment it happens to work because
eeepc-laptop is loaded first, but it doesn't work the other way round.
If pciehp is loaded first then we fail to claim the slot - we need to
respect this and not handle hotplug events.

Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Len Brown <len.brown@intel.com>

diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index 387e31b..847adbd 100644 (file)
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -668,15 +668,20 @@ static int eeepc_get_adapter_status(struct hotplug_slot *hotplug_slot,
 static void eeepc_hotplug_work(struct work_struct *work)
 {
        struct pci_dev *dev;
-       struct pci_bus *bus = pci_find_bus(0, 1);
-       bool blocked;
+       struct pci_bus *bus;
+       bool blocked = eeepc_wlan_rfkill_blocked();
+
+       rfkill_force_state(ehotk->wlan_rfkill, blocked);
 
+       if (ehotk->hotplug_slot == NULL)
+               return;
+
+       bus = pci_find_bus(0, 1);
        if (!bus) {
                pr_warning("Unable to find PCI bus 1?\n");
                return;
        }
 
-       blocked = eeepc_wlan_rfkill_blocked();
        if (!blocked) {
                dev = pci_get_slot(bus, 0);
                if (dev) {
@@ -697,8 +702,6 @@ static void eeepc_hotplug_work(struct work_struct *work)
                        pci_dev_put(dev);
                }
        }
-
-       rfkill_force_state(ehotk->wlan_rfkill, !blocked);
 }
 
 static void eeepc_rfkill_notify(acpi_handle handle, u32 event, void *data)