1 files changed, 36 insertions, 4 deletions

diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
index e1c4938b301b..af2bb20cb2fb 100644
--- a/drivers/platform/x86/acer-wmi.c
+++ b/drivers/platform/x86/acer-wmi.c
@@ -99,6 +99,7 @@ enum acer_wmi_event_ids {
 static const struct key_entry acer_wmi_keymap[] = {
         {KE_KEY, 0x01, {KEY_WLAN} },     /* WiFi */
         {KE_KEY, 0x03, {KEY_WLAN} },     /* WiFi */
+        {KE_KEY, 0x04, {KEY_WLAN} },     /* WiFi */
         {KE_KEY, 0x12, {KEY_BLUETOOTH} },       /* BT */
         {KE_KEY, 0x21, {KEY_PROG1} },    /* Backup */
         {KE_KEY, 0x22, {KEY_PROG2} },    /* Arcade */
@@ -304,6 +305,10 @@ static struct quirk_entry quirk_fujitsu_amilo_li_1718 = {
         .wireless = 2,
 };
 
+static struct quirk_entry quirk_lenovo_ideapad_s205 = {
+        .wireless = 3,
+};
+
 /* The Aspire One has a dummy ACPI-WMI interface - disable it */
 static struct dmi_system_id __devinitdata acer_blacklist[] = {
         {
@@ -450,6 +455,15 @@ static struct dmi_system_id acer_quirks[] = {
                 },
                 .driver_data = &quirk_medion_md_98300,
         },
+        {
+                .callback = dmi_matched,
+                .ident = "Lenovo Ideapad S205",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "10382LG"),
+                },
+                .driver_data = &quirk_lenovo_ideapad_s205,
+        },
         {}
 };
 
@@ -542,6 +556,12 @@ struct wmi_interface *iface)
                                 return AE_ERROR;
                         *value = result & 0x1;
                         return AE_OK;
+                case 3:
+                        err = ec_read(0x78, &result);
+                        if (err)
+                                return AE_ERROR;
+                        *value = result & 0x1;
+                        return AE_OK;
                 default:
                         err = ec_read(0xA, &result);
                         if (err)
@@ -1266,8 +1286,13 @@ static void acer_rfkill_update(struct work_struct *ignored)
         acpi_status status;
 
         status = get_u32(&state, ACER_CAP_WIRELESS);
-        if (ACPI_SUCCESS(status))
-                rfkill_set_sw_state(wireless_rfkill, !state);
+        if (ACPI_SUCCESS(status)) {
+                if (quirks->wireless == 3) {
+                        rfkill_set_hw_state(wireless_rfkill, !state);
+                } else {
+                        rfkill_set_sw_state(wireless_rfkill, !state);
+                }
+        }
 
         if (has_cap(ACER_CAP_BLUETOOTH)) {
                 status = get_u32(&state, ACER_CAP_BLUETOOTH);
@@ -1400,6 +1425,9 @@ static ssize_t show_bool_threeg(struct device *dev,
 {
         u32 result; \
         acpi_status status;
+
+        pr_info("This threeg sysfs will be removed in 2012"
+                " - used by: %s\n", current->comm);
         if (wmi_has_guid(WMID_GUID3))
                 status = wmid3_get_device_status(&result,
                                 ACER_WMID3_GDS_THREEG);
@@ -1415,8 +1443,10 @@ static ssize_t set_bool_threeg(struct device *dev,
 {
         u32 tmp = simple_strtoul(buf, NULL, 10);
         acpi_status status = set_u32(tmp, ACER_CAP_THREEG);
-                if (ACPI_FAILURE(status))
-                        return -EINVAL;
+        pr_info("This threeg sysfs will be removed in 2012"
+                " - used by: %s\n", current->comm);
+        if (ACPI_FAILURE(status))
+                return -EINVAL;
         return count;
 }
 static DEVICE_ATTR(threeg, S_IRUGO | S_IWUSR, show_bool_threeg,
@@ -1425,6 +1455,8 @@ static DEVICE_ATTR(threeg, S_IRUGO | S_IWUSR, show_bool_threeg,
 static ssize_t show_interface(struct device *dev, struct device_attribute *attr,
         char *buf)
 {
+        pr_info("This interface sysfs will be removed in 2012"
+                " - used by: %s\n", current->comm);
         switch (interface->type) {
         case ACER_AMW0:
                 return sprintf(buf, "AMW0\n");