asus-laptop: let WLED alone on L1400B
Corentin Chary [Sun, 6 Feb 2011 12:27:30 +0000 (13:27 +0100)]
Asus took the DSDT from another model (L84F), made some change
to make it work, but forgot to remove WLED method (the laptop
doesn't have a wireless card). They even didn't change the model
name.

ref: https://bugzilla.kernel.org/show_bug.cgi?id=25712

Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>

drivers/platform/x86/asus-laptop.c

index 5a6f7d7..2b9d7b8 100644 (file)
@@ -50,6 +50,7 @@
 #include <linux/input/sparse-keymap.h>
 #include <linux/rfkill.h>
 #include <linux/slab.h>
+#include <linux/dmi.h>
 #include <acpi/acpi_drivers.h>
 #include <acpi/acpi_bus.h>
 
@@ -1557,6 +1558,20 @@ static int __devinit asus_acpi_init(struct asus_laptop *asus)
        return result;
 }
 
+static void __devinit asus_dmi_check(void)
+{
+       const char *model;
+
+       model = dmi_get_system_info(DMI_PRODUCT_NAME);
+       if (!model)
+               return;
+
+       /* On L1400B WLED control the sound card, don't mess with it ... */
+       if (strncmp(model, "L1400B", 6) == 0) {
+               wlan_status = -1;
+       }
+}
+
 static bool asus_device_present;
 
 static int __devinit asus_acpi_add(struct acpi_device *device)
@@ -1575,6 +1590,8 @@ static int __devinit asus_acpi_add(struct acpi_device *device)
        device->driver_data = asus;
        asus->device = device;
 
+       asus_dmi_check();
+
        result = asus_acpi_init(asus);
        if (result)
                goto fail_platform;