diff options
| author | Corentin Chary <corentin.chary@gmail.com> | 2011-02-06 13:27:30 +0100 |
|---|---|---|
| committer | Matthew Garrett <mjg@redhat.com> | 2011-03-28 06:05:19 -0400 |
| commit | af96f87703f33a4dba4b51c7b3f0d6f874aa4853 (patch) | |
| tree | 43f3572697befd44f173c56a3f97178e835f139d | |
| parent | 77ca5b0197138db1260bbbb95ce3fd015dd10437 (diff) | |
| download | op-kernel-dev-af96f87703f33a4dba4b51c7b3f0d6f874aa4853.zip op-kernel-dev-af96f87703f33a4dba4b51c7b3f0d6f874aa4853.tar.gz | |
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=25712
Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
| -rw-r--r-- | drivers/platform/x86/asus-laptop.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c index 5a6f7d7..2b9d7b8 100644 --- a/drivers/platform/x86/asus-laptop.c +++ b/drivers/platform/x86/asus-laptop.c @@ -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; |
