Merge branch 'eeepc-laptop' into acpi4asus

1 files changed, 20 insertions, 1 deletions

diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index e2be6bb33d92..9a844caa3756 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -578,6 +578,8 @@ static void eeepc_rfkill_hotplug(struct eeepc_laptop *eeepc)
         struct pci_dev *dev;
         struct pci_bus *bus;
         bool blocked = eeepc_wlan_rfkill_blocked(eeepc);
+        bool absent;
+        u32 l;
 
         if (eeepc->wlan_rfkill)
                 rfkill_set_sw_state(eeepc->wlan_rfkill, blocked);
@@ -591,6 +593,22 @@ static void eeepc_rfkill_hotplug(struct eeepc_laptop *eeepc)
                         goto out_unlock;
                 }
 
+                if (pci_bus_read_config_dword(bus, 0, PCI_VENDOR_ID, &l)) {
+                        pr_err("Unable to read PCI config space?\n");
+                        goto out_unlock;
+                }
+                absent = (l == 0xffffffff);
+
+                if (blocked != absent) {
+                        pr_warning("BIOS says wireless lan is %s, "
+                                        "but the pci device is %s\n",
+                                blocked ? "blocked" : "unblocked",
+                                absent ? "absent" : "present");
+                        pr_warning("skipped wireless hotplug as probably "
+                                        "inappropriate for this model\n");
+                        goto out_unlock;
+                }
+
                 if (!blocked) {
                         dev = pci_get_slot(bus, 0);
                         if (dev) {
@@ -1277,7 +1295,8 @@ static void eeepc_dmi_check(struct eeepc_laptop *eeepc)
          * hotplug code. In fact, current hotplug code seems to unplug another
          * device...
          */
-        if (strcmp(model, "1005HA") == 0 || strcmp(model, "1201N") == 0) {
+        if (strcmp(model, "1005HA") == 0 || strcmp(model, "1201N") == 0 ||
+            strcmp(model, "1005PE") == 0) {
                 eeepc->hotplug_disabled = true;
                 pr_info("wlan hotplug disabled\n");
         }