1 files changed, 24 insertions, 4 deletions

diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
index 76441dcbe5ff..b062d3d7b373 100644
--- a/drivers/platform/x86/toshiba_acpi.c
+++ b/drivers/platform/x86/toshiba_acpi.c
@@ -222,6 +222,12 @@ static const struct dmi_system_id toshiba_alt_keymap_dmi[] = {
                         DMI_MATCH(DMI_PRODUCT_NAME, "Satellite M840"),
                 },
         },
+        {
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Qosmio X75-A"),
+                },
+        },
         {}
 };
 
@@ -229,6 +235,7 @@ static const struct key_entry toshiba_acpi_alt_keymap[] = {
         { KE_KEY, 0x157, { KEY_MUTE } },
         { KE_KEY, 0x102, { KEY_ZOOMOUT } },
         { KE_KEY, 0x103, { KEY_ZOOMIN } },
+        { KE_KEY, 0x12c, { KEY_KBDILLUMTOGGLE } },
         { KE_KEY, 0x139, { KEY_ZOOMRESET } },
         { KE_KEY, 0x13e, { KEY_SWITCHVIDEOMODE } },
         { KE_KEY, 0x13c, { KEY_BRIGHTNESSDOWN } },
@@ -872,7 +879,9 @@ static int lcd_proc_open(struct inode *inode, struct file *file)
 
 static int set_lcd_brightness(struct toshiba_acpi_dev *dev, int value)
 {
-        u32 hci_result;
+        u32 in[HCI_WORDS] = { HCI_SET, HCI_LCD_BRIGHTNESS, 0, 0, 0, 0 };
+        u32 out[HCI_WORDS];
+        acpi_status status;
 
         if (dev->tr_backlight_supported) {
                 bool enable = !value;
@@ -883,9 +892,20 @@ static int set_lcd_brightness(struct toshiba_acpi_dev *dev, int value)
                         value--;
         }
 
-        value = value << HCI_LCD_BRIGHTNESS_SHIFT;
-        hci_write1(dev, HCI_LCD_BRIGHTNESS, value, &hci_result);
-        return hci_result == HCI_SUCCESS ? 0 : -EIO;
+        in[2] = value << HCI_LCD_BRIGHTNESS_SHIFT;
+        status = hci_raw(dev, in, out);
+        if (ACPI_FAILURE(status) || out[0] == HCI_FAILURE) {
+                pr_err("ACPI call to set brightness failed");
+                return -EIO;
+        }
+        /* Extra check for "incomplete" backlight method, where the AML code
+         * doesn't check for HCI_SET or HCI_GET and returns HCI_SUCCESS,
+         * the actual brightness, and in some cases the max brightness.
+         */
+        if (out[2] > 0  || out[3] == 0xE000)
+                return -ENODEV;
+
+        return out[0] == HCI_SUCCESS ? 0 : -EIO;
 }
 
 static int set_lcd_status(struct backlight_device *bd)