---

yaml
---
r: 166400
b: refs/heads/master
c: 176dd98
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4be73005e4dcf111fa88f7265ed147e2de38b075
+refs/heads/master: 176dd98523fee4836210bc0834c8e3e6a93247bf

trunk/Documentation/laptops/thinkpad-acpi.txt

@@ -525,14 +525,14 @@ compatibility purposes when hotkey_report_mode is set to 1.
 0x2305		System is waking up from suspend to eject bay
 0x2404		System is waking up from hibernation to undock
 0x2405		System is waking up from hibernation to eject bay
+0x5010		Brightness level changed/control event
 
 The above events are never propagated by the driver.
 
 0x3003		Bay ejection (see 0x2x05) complete, can sleep again
 0x4003		Undocked (see 0x2x04), can sleep again
 0x500B		Tablet pen inserted into its storage bay
 0x500C		Tablet pen removed from its storage bay
-0x5010		Brightness level changed (newer Lenovo BIOSes)
 
 The above events are propagated by the driver.
 

trunk/drivers/platform/x86/thinkpad_acpi.c

@@ -3305,7 +3305,6 @@ static bool hotkey_notify_usrevent(const u32 hkey,
 	*ignore_acpi_ev = false;
 
 	switch (hkey) {
-	case 0x5010: /* Lenovo new BIOS: brightness changed */
 	case 0x500b: /* X61t: tablet pen inserted into bay */
 	case 0x500c: /* X61t: tablet pen removed from bay */
 		return true;
@@ -3317,9 +3316,10 @@ static bool hotkey_notify_usrevent(const u32 hkey,
 		*send_acpi_ev = false;
 		return true;
 
-	case 0x5001:
-	case 0x5002:
-		/* LID switch events.  Do not propagate */
+	case 0x5001: /* Lid close */
+	case 0x5002: /* Lid open */
+	case 0x5010: /* brightness control */
+		/* do not propagate these events */
 		*ignore_acpi_ev = true;
 		return true;