Commit af96f877 authored by Corentin Chary's avatar Corentin Chary Committed by Matthew Garrett

asus-laptop: let WLED alone on L1400B

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=25712Signed-off-by: default avatarCorentin Chary <corentin.chary@gmail.com>
Signed-off-by: default avatarMatthew Garrett <mjg@redhat.com>
parent 77ca5b01
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
#include <linux/input/sparse-keymap.h> #include <linux/input/sparse-keymap.h>
#include <linux/rfkill.h> #include <linux/rfkill.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/dmi.h>
#include <acpi/acpi_drivers.h> #include <acpi/acpi_drivers.h>
#include <acpi/acpi_bus.h> #include <acpi/acpi_bus.h>
...@@ -1557,6 +1558,20 @@ static int __devinit asus_acpi_init(struct asus_laptop *asus) ...@@ -1557,6 +1558,20 @@ static int __devinit asus_acpi_init(struct asus_laptop *asus)
return result; 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 bool asus_device_present;
static int __devinit asus_acpi_add(struct acpi_device *device) static int __devinit asus_acpi_add(struct acpi_device *device)
...@@ -1575,6 +1590,8 @@ 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; device->driver_data = asus;
asus->device = device; asus->device = device;
asus_dmi_check();
result = asus_acpi_init(asus); result = asus_acpi_init(asus);
if (result) if (result)
goto fail_platform; goto fail_platform;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment