summaryrefslogtreecommitdiffstats
path: root/drivers/platform
diff options
context:
space:
mode:
authorAlan Jenkins <alan-jenkins@tuffmail.co.uk>2009-08-28 12:56:32 +0000
committerLen Brown <len.brown@intel.com>2009-08-28 15:21:10 -0400
commit6d41839e762f8b8b03dbb97fd0d41b244d0bc902 (patch)
tree168fa39bf92766bffeaaa0247bc64e522e18c08d /drivers/platform
parent326ba5010a5429a5a528b268b36a5900d4ab0eba (diff)
downloadop-kernel-dev-6d41839e762f8b8b03dbb97fd0d41b244d0bc902.zip
op-kernel-dev-6d41839e762f8b8b03dbb97fd0d41b244d0bc902.tar.gz
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>
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/x86/eeepc-laptop.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index 222ffb89..69d73ed 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -664,15 +664,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_set_sw_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) {
@@ -693,8 +698,6 @@ static void eeepc_hotplug_work(struct work_struct *work)
pci_dev_put(dev);
}
}
-
- rfkill_set_sw_state(ehotk->wlan_rfkill, blocked);
}
static void eeepc_rfkill_notify(acpi_handle handle, u32 event, void *data)
OpenPOWER on IntegriCloud