1 files changed, 12 insertions, 8 deletions

diff --git a/drivers/platform/x86/classmate-laptop.c b/drivers/platform/x86/classmate-laptop.c
index 341cbfef93ee..94f93b621d7b 100644
--- a/drivers/platform/x86/classmate-laptop.c
+++ b/drivers/platform/x86/classmate-laptop.c
@@ -522,18 +522,20 @@ static int cmpc_rfkill_block(void *data, bool blocked)
         acpi_status status;
         acpi_handle handle;
         unsigned long long state;
+        bool is_blocked;
 
         handle = data;
         status = cmpc_get_rfkill_wlan(handle, &state);
         if (ACPI_FAILURE(status))
                 return -ENODEV;
-        if (blocked)
-                state &= ~1;
-        else
-                state |= 1;
-        status = cmpc_set_rfkill_wlan(handle, state);
-        if (ACPI_FAILURE(status))
-                return -ENODEV;
+        /* Check if we really need to call cmpc_set_rfkill_wlan */
+        is_blocked = state & 1 ? false : true;
+        if (is_blocked != blocked) {
+                state = blocked ? 0 : 1;
+                status = cmpc_set_rfkill_wlan(handle, state);
+                if (ACPI_FAILURE(status))
+                        return -ENODEV;
+        }
         return 0;
 }
 
@@ -562,6 +564,7 @@ static int cmpc_ipml_add(struct acpi_device *acpi)
                 return -ENOMEM;
 
         memset(&props, 0, sizeof(struct backlight_properties));
+        props.type = BACKLIGHT_PLATFORM;
         props.max_brightness = 7;
         ipml->bd = backlight_device_register("cmpc_bl", &acpi->dev,
                                              acpi->handle, &cmpc_bl_ops,
@@ -653,8 +656,9 @@ static void cmpc_keys_handler(struct acpi_device *dev, u32 event)
 
         if ((event & 0x0F) < ARRAY_SIZE(cmpc_keys_codes))
                 code = cmpc_keys_codes[event & 0x0F];
-        inputdev = dev_get_drvdata(&dev->dev);;
+        inputdev = dev_get_drvdata(&dev->dev);
         input_report_key(inputdev, code, !(event & 0x10));
+        input_sync(inputdev);
 }
 
 static void cmpc_keys_idev_init(struct input_dev *inputdev)