2 files changed, 25 insertions, 6 deletions

diff --git a/Documentation/ABI/testing/sysfs-platform-eeepc-laptop b/Documentation/ABI/testing/sysfs-platform-eeepc-laptop
index 7445dfb321b..5b026c69587 100644
--- a/Documentation/ABI/testing/sysfs-platform-eeepc-laptop
+++ b/Documentation/ABI/testing/sysfs-platform-eeepc-laptop
@@ -1,4 +1,4 @@
-What:           /sys/devices/platform/eeepc-laptop/disp
+What:           /sys/devices/platform/eeepc/disp
 Date:           May 2008
 KernelVersion:  2.6.26
 Contact:        "Corentin Chary" <corentincj@iksaif.net>
@@ -9,21 +9,21 @@ Description:
                 - 3 = LCD+CRT
                 If you run X11, you should use xrandr instead.
 
-What:           /sys/devices/platform/eeepc-laptop/camera
+What:           /sys/devices/platform/eeepc/camera
 Date:           May 2008
 KernelVersion:  2.6.26
 Contact:        "Corentin Chary" <corentincj@iksaif.net>
 Description:
                 Control the camera. 1 means on, 0 means off.
 
-What:           /sys/devices/platform/eeepc-laptop/cardr
+What:           /sys/devices/platform/eeepc/cardr
 Date:           May 2008
 KernelVersion:  2.6.26
 Contact:        "Corentin Chary" <corentincj@iksaif.net>
 Description:
                 Control the card reader. 1 means on, 0 means off.
 
-What:           /sys/devices/platform/eeepc-laptop/cpufv
+What:           /sys/devices/platform/eeepc/cpufv
 Date:           Jun 2009
 KernelVersion:  2.6.31
 Contact:        "Corentin Chary" <corentincj@iksaif.net>
@@ -42,7 +42,7 @@ Description:
                     `------------ Availables modes
                 For example, 0x301 means: mode 1 selected, 3 available modes.
 
-What:           /sys/devices/platform/eeepc-laptop/available_cpufv
+What:           /sys/devices/platform/eeepc/available_cpufv
 Date:           Jun 2009
 KernelVersion:  2.6.31
 Contact:        "Corentin Chary" <corentincj@iksaif.net>
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index e2be6bb33d9..9a844caa375 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");
         }