From 7207a7b305794dc8aa26bcc546da7c85a365bf9e Mon Sep 17 00:00:00 2001
From: Corentin Chary <corentin.chary@gmail.com>
Date: Tue, 20 Mar 2012 09:53:10 +0100
Subject: [PATCH] --- yaml --- r: 297015 b: refs/heads/master c:
 6a2bcccdb3206950d28e343476d9050e23e79b7e h: refs/heads/master i:   297013:
 fd9f452aad35615f9a75df771bc46e9f7913bfb3   297011:
 09d98c9ff1b3a728e0ee46fcdc55568a163f9a1e   297007:
 d59700abcaa6c26e38bc88bd3884f57b7a535d2a v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/platform/x86/asus-nb-wmi.c | 6 +++++-
 trunk/drivers/platform/x86/asus-wmi.c    | 4 ++--
 trunk/drivers/platform/x86/asus-wmi.h    | 2 +-
 trunk/drivers/platform/x86/eeepc-wmi.c   | 2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 5cf24f6f3ea1..9204d0ed67bb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e0044bedc1fc94a61cc32fa25dcab9a4e4a9218
+refs/heads/master: 6a2bcccdb3206950d28e343476d9050e23e79b7e
diff --git a/trunk/drivers/platform/x86/asus-nb-wmi.c b/trunk/drivers/platform/x86/asus-nb-wmi.c
index 1aea6b8019be..b12038c492c7 100644
--- a/trunk/drivers/platform/x86/asus-nb-wmi.c
+++ b/trunk/drivers/platform/x86/asus-nb-wmi.c
@@ -51,9 +51,13 @@ static uint wapf;
 module_param(wapf, uint, 0444);
 MODULE_PARM_DESC(wapf, "WAPF value");
 
+static struct quirk_entry quirk_asus_unknown = {
+};
+
 static void asus_nb_wmi_quirks(struct asus_wmi_driver *driver)
 {
-	driver->wapf = wapf;
+	driver->quirks = &quirk_asus_unknown;
+	driver->quirks->wapf = wapf;
 }
 
 static const struct key_entry asus_nb_wmi_keymap[] = {
diff --git a/trunk/drivers/platform/x86/asus-wmi.c b/trunk/drivers/platform/x86/asus-wmi.c
index c4ad76ee7b5f..ff9cfd83b09f 100644
--- a/trunk/drivers/platform/x86/asus-wmi.c
+++ b/trunk/drivers/platform/x86/asus-wmi.c
@@ -1471,9 +1471,9 @@ static int asus_wmi_platform_init(struct asus_wmi *asus)
 
 	/* CWAP allow to define the behavior of the Fn+F2 key,
 	 * this method doesn't seems to be present on Eee PCs */
-	if (asus->driver->wapf >= 0)
+	if (asus->driver->quirks->wapf >= 0)
 		asus_wmi_set_devstate(ASUS_WMI_DEVID_CWAP,
-				      asus->driver->wapf, NULL);
+				      asus->driver->quirks->wapf, NULL);
 
 	return asus_wmi_sysfs_init(asus->platform_device);
 }
diff --git a/trunk/drivers/platform/x86/asus-wmi.h b/trunk/drivers/platform/x86/asus-wmi.h
index 35003e4f1316..d43b66742004 100644
--- a/trunk/drivers/platform/x86/asus-wmi.h
+++ b/trunk/drivers/platform/x86/asus-wmi.h
@@ -39,10 +39,10 @@ struct quirk_entry {
 	bool hotplug_wireless;
 	bool scalar_panel_brightness;
 	bool store_backlight_power;
+	int wapf;
 };
 
 struct asus_wmi_driver {
-	int			wapf;
 	int			brightness;
 	int			panel_power;
 
diff --git a/trunk/drivers/platform/x86/eeepc-wmi.c b/trunk/drivers/platform/x86/eeepc-wmi.c
index 9f8ccf9f590d..389ff888cb6c 100644
--- a/trunk/drivers/platform/x86/eeepc-wmi.c
+++ b/trunk/drivers/platform/x86/eeepc-wmi.c
@@ -209,10 +209,10 @@ static int eeepc_wmi_probe(struct platform_device *pdev)
 
 static void eeepc_wmi_quirks(struct asus_wmi_driver *driver)
 {
-	driver->wapf = -1;
 	driver->panel_power = FB_BLANK_UNBLANK;
 	driver->quirks = &quirk_asus_unknown;
 	driver->quirks->hotplug_wireless = hotplug_wireless;
+	driver->quirks->wapf = -1;
 	dmi_check_system(asus_quirks);
 	driver->quirks = quirks;
 }