These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / platform / x86 / sony-laptop.c

diff --git a/kernel/drivers/platform/x86/sony-laptop.c b/kernel/drivers/platform/x86/sony-laptop.c
index e51c1e7..f73c295 100644 (file)
--- a/kernel/drivers/platform/x86/sony-laptop.c
+++ b/kernel/drivers/platform/x86/sony-laptop.c
@@ -69,6 +69,7 @@
 #include <linux/miscdevice.h>
 #endif
 #include <asm/uaccess.h>
+#include <acpi/video.h>
 
 #define dprintk(fmt, ...)                      \
 do {                                           \
@@ -1203,6 +1204,8 @@ static void sony_nc_notify(struct acpi_device *device, u32 event)
 {
        u32 real_ev = event;
        u8 ev_type = 0;
+       int ret;
+
        dprintk("sony_nc_notify, event: 0x%.2x\n", event);
 
        if (event >= 0x90) {
@@ -1224,13 +1227,12 @@ static void sony_nc_notify(struct acpi_device *device, u32 event)
                case 0x0100:
                case 0x0127:
                        ev_type = HOTKEY;
-                       real_ev = sony_nc_hotkeys_decode(event, handle);
+                       ret = sony_nc_hotkeys_decode(event, handle);
 
-                       if (real_ev > 0)
-                               sony_laptop_report_input_event(real_ev);
-                       else
-                               /* restore the original event for reporting */
-                               real_ev = event;
+                       if (ret > 0) {
+                               sony_laptop_report_input_event(ret);
+                               real_ev = ret;
+                       }
 
                        break;
 
@@ -3198,12 +3200,8 @@ static int sony_nc_add(struct acpi_device *device)
                        sony_nc_function_setup(device, sony_pf_device);
        }
 
-       /* setup input devices and helper fifo */
-       if (acpi_video_backlight_support()) {
-               pr_info("brightness ignored, must be controlled by ACPI video driver\n");
-       } else {
+       if (acpi_video_get_backlight_type() == acpi_backlight_vendor)
                sony_nc_backlight_setup();
-       }
 
        /* create sony_pf sysfs attributes related to the SNC device */
        for (item = sony_nc_values; item->name; ++item) {