mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-04-29 11:44:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'platform-drivers-x86-v5.12-3' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86

Browse Source 
Pull x86 platform driver fix from Hans de Goede:
 "A single bugfix to fix spurious wakeups from suspend caused by recent
  intel-hid driver changes"

* tag 'platform-drivers-x86-v5.12-3' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86:
  platform/x86: intel-hid: Fix spurious wakeups caused by tablet-mode events during suspend
This commit is contained in:
Linus Torvalds
2021-04-07 09:14:04 -07:00
parent e3bb2f4f96 a3790a8a94
commit 5ba091db93
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/platform/x86/intel-hid.c
View File

@@ -483,11 +483,16 @@ static void notify_handler(acpi_handle handle, u32 event, void *context)
goto wakeup;
/*
* Switch events will wake the device and report the new switch
* position to the input subsystem.
* Some devices send (duplicate) tablet-mode events when moved
* around even though the mode has not changed; and they do this
* even when suspended.
* Update the switch state in case it changed and then return
* without waking up to avoid spurious wakeups.
*/
if (priv->switches && (event == 0xcc || event == 0xcd))
goto wakeup;
if (event == 0xcc || event == 0xcd) {
report_tablet_mode_event(priv->switches, event);
return;
}
/* Wake up on 5-button array events only. */
if (event == 0xc0 || !priv->array)
@@ -501,9 +506,6 @@ static void notify_handler(acpi_handle handle, u32 event, void *context)
wakeup:
pm_wakeup_hard_event(&device->dev);
if (report_tablet_mode_event(priv->switches, event))
return;
return;
}