Skip to content

Commit

Permalink
asus-laptop: let WLED alone on L1400B
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Corentin Chary authored and Matthew Garrett committed Mar 28, 2011
1 parent 77ca5b0 commit af96f87
Showing 1 changed file with 17 additions and 0 deletions.
17 changes: 17 additions & 0 deletions drivers/platform/x86/asus-laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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)
Expand All @@ -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;
Expand Down

0 comments on commit af96f87

Please sign in to comment.