From bb7d00e498ba3c21962951f9c819137ea2d98e08 Mon Sep 17 00:00:00 2001 From: Corentin Chary Date: Tue, 20 Mar 2012 09:53:12 +0100 Subject: [PATCH] --- yaml --- r: 297017 b: refs/heads/master c: c55d995dd3cebffdeb2b7eff8acc813c56d62c97 h: refs/heads/master i: 297015: 7207a7b305794dc8aa26bcc546da7c85a365bf9e v: v3 --- [refs] | 2 +- trunk/drivers/platform/x86/eeepc-wmi.c | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 770b8764e16e..5e7ef0688aa2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fb05b9f53fa9131ae86eb8cc4fda20e943a86e36 +refs/heads/master: c55d995dd3cebffdeb2b7eff8acc813c56d62c97 diff --git a/trunk/drivers/platform/x86/eeepc-wmi.c b/trunk/drivers/platform/x86/eeepc-wmi.c index 389ff888cb6c..0bb0aaf43aba 100644 --- a/trunk/drivers/platform/x86/eeepc-wmi.c +++ b/trunk/drivers/platform/x86/eeepc-wmi.c @@ -49,7 +49,6 @@ MODULE_LICENSE("GPL"); MODULE_ALIAS("wmi:"EEEPC_WMI_EVENT_GUID); -static struct quirk_entry *quirks; static bool hotplug_wireless; module_param(hotplug_wireless, bool, 0444); @@ -108,6 +107,8 @@ static struct quirk_entry quirk_asus_et2012_type3 = { .store_backlight_power = true, }; +static struct quirk_entry *quirks; + static int dmi_matched(const struct dmi_system_id *dmi) { char *model; @@ -209,12 +210,14 @@ static int eeepc_wmi_probe(struct platform_device *pdev) static void eeepc_wmi_quirks(struct asus_wmi_driver *driver) { - driver->panel_power = FB_BLANK_UNBLANK; - driver->quirks = &quirk_asus_unknown; - driver->quirks->hotplug_wireless = hotplug_wireless; - driver->quirks->wapf = -1; + quirks = &quirk_asus_unknown; + quirks->hotplug_wireless = hotplug_wireless; + dmi_check_system(asus_quirks); + driver->quirks = quirks; + driver->quirks->wapf = -1; + driver->panel_power = FB_BLANK_UNBLANK; } static struct asus_wmi_driver asus_wmi_driver = {