shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 04:48:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge 5ba091db93 ("Merge tag 'platform-drivers-x86-v5.12-3' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86") into android-mainline

Browse Source 
Steps on the way to 5.12-rc7

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ib49d869702643e6575d8624a8d00e4c016cd04ae
This commit is contained in:
Greg Kroah-Hartman
2021-04-18 15:12:51 +02:00
parent aca56965ab 5ba091db93
commit 8b1455531f
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;
}