aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/laptops/thinkpad-acpi.txt2
-rw-r--r--drivers/platform/x86/thinkpad_acpi.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/laptops/thinkpad-acpi.txt b/Documentation/laptops/thinkpad-acpi.txt
index 6d03487ef1c7..f635fb09d620 100644
--- a/Documentation/laptops/thinkpad-acpi.txt
+++ b/Documentation/laptops/thinkpad-acpi.txt
@@ -525,6 +525,7 @@ compatibility purposes when hotkey_report_mode is set to 1.
5250x2305 System is waking up from suspend to eject bay 5250x2305 System is waking up from suspend to eject bay
5260x2404 System is waking up from hibernation to undock 5260x2404 System is waking up from hibernation to undock
5270x2405 System is waking up from hibernation to eject bay 5270x2405 System is waking up from hibernation to eject bay
5280x5010 Brightness level changed/control event
528 529
529The above events are never propagated by the driver. 530The above events are never propagated by the driver.
530 531
@@ -532,7 +533,6 @@ The above events are never propagated by the driver.
5320x4003 Undocked (see 0x2x04), can sleep again 5330x4003 Undocked (see 0x2x04), can sleep again
5330x500B Tablet pen inserted into its storage bay 5340x500B Tablet pen inserted into its storage bay
5340x500C Tablet pen removed from its storage bay 5350x500C Tablet pen removed from its storage bay
5350x5010 Brightness level changed (newer Lenovo BIOSes)
536 536
537The above events are propagated by the driver. 537The above events are propagated by the driver.
538 538
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 1b4d6f686bf0..66ba5f57d786 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -3305,7 +3305,6 @@ static bool hotkey_notify_usrevent(const u32 hkey,
3305 *ignore_acpi_ev = false; 3305 *ignore_acpi_ev = false;
3306 3306
3307 switch (hkey) { 3307 switch (hkey) {
3308 case 0x5010: /* Lenovo new BIOS: brightness changed */
3309 case 0x500b: /* X61t: tablet pen inserted into bay */ 3308 case 0x500b: /* X61t: tablet pen inserted into bay */
3310 case 0x500c: /* X61t: tablet pen removed from bay */ 3309 case 0x500c: /* X61t: tablet pen removed from bay */
3311 return true; 3310 return true;
@@ -3317,9 +3316,10 @@ static bool hotkey_notify_usrevent(const u32 hkey,
3317 *send_acpi_ev = false; 3316 *send_acpi_ev = false;
3318 return true; 3317 return true;
3319 3318
3320 case 0x5001: 3319 case 0x5001: /* Lid close */
3321 case 0x5002: 3320 case 0x5002: /* Lid open */
3322 /* LID switch events. Do not propagate */ 3321 case 0x5010: /* brightness control */
3322 /* do not propagate these events */
3323 *ignore_acpi_ev = true; 3323 *ignore_acpi_ev = true;
3324 return true; 3324 return true;
3325 3325