summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Berg <bberg@redhat.com>2020-11-23 14:21:57 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-12-02 08:48:12 +0100
commit0b50485e5d8b7a847a3a041b76f52ff48f1c3f65 (patch)
tree6417a223f97550f21ae04ca85ee45aa370b8e796
parentb4446737da080809caedab79c2ea9821adc6de0a (diff)
downloadlinux-stable-0b50485e5d8b7a847a3a041b76f52ff48f1c3f65.tar.gz
linux-stable-0b50485e5d8b7a847a3a041b76f52ff48f1c3f65.tar.bz2
linux-stable-0b50485e5d8b7a847a3a041b76f52ff48f1c3f65.zip
platform/x86: thinkpad_acpi: Send tablet mode switch at wakeup time
[ Upstream commit e40cc1b476d60f22628741e53cf3446a29e6e6b9 ] The lid state may change while the machine is suspended. As such, we may need to re-check the state at wake-up time (at least when waking up from hibernation). Add the appropriate call to the resume handler in order to sync the SW_TABLET_MODE switch state with the hardware state. Fixes: dda3ec0aa631 ("platform/x86: thinkpad_acpi: Implement tablet mode using GMMS method") BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=210269 Signed-off-by: Benjamin Berg <bberg@redhat.com> Acked-by: Henrique de Moraes Holschuh <hnh@hmh.eng.br> Link: https://lore.kernel.org/r/20201123132157.866303-1-benjamin@sipsolutions.net Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/platform/x86/thinkpad_acpi.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 98bd8213b037..8cc01857bc5c 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -4251,6 +4251,7 @@ static void hotkey_resume(void)
pr_err("error while attempting to reset the event firmware interface\n");
tpacpi_send_radiosw_update();
+ tpacpi_input_send_tabletsw();
hotkey_tablet_mode_notify_change();
hotkey_wakeup_reason_notify_change();
hotkey_wakeup_hotunplug_complete_notify_change();