|
@@ -3830,13 +3830,28 @@ static void hotkey_notify(struct ibm_struct *ibm, u32 event)
|
|
|
|
|
|
static void hotkey_suspend(void)
|
|
|
{
|
|
|
+ int hkeyv;
|
|
|
+
|
|
|
/* Do these on suspend, we get the events on early resume! */
|
|
|
hotkey_wakeup_reason = TP_ACPI_WAKEUP_NONE;
|
|
|
hotkey_autosleep_ack = 0;
|
|
|
+
|
|
|
+ /* save previous mode of adaptive keyboard of X1 Carbon */
|
|
|
+ if (acpi_evalf(hkey_handle, &hkeyv, "MHKV", "qd")) {
|
|
|
+ if ((hkeyv >> 8) == 2) {
|
|
|
+ if (!acpi_evalf(hkey_handle,
|
|
|
+ &adaptive_keyboard_prev_mode,
|
|
|
+ "GTRW", "dd", 0)) {
|
|
|
+ pr_err("Cannot read adaptive keyboard mode.\n");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
static void hotkey_resume(void)
|
|
|
{
|
|
|
+ int hkeyv;
|
|
|
+
|
|
|
tpacpi_disable_brightness_delay();
|
|
|
|
|
|
if (hotkey_status_set(true) < 0 ||
|
|
@@ -3849,6 +3864,18 @@ static void hotkey_resume(void)
|
|
|
hotkey_wakeup_reason_notify_change();
|
|
|
hotkey_wakeup_hotunplug_complete_notify_change();
|
|
|
hotkey_poll_setup_safe(false);
|
|
|
+
|
|
|
+ /* restore previous mode of adapive keyboard of X1 Carbon */
|
|
|
+ if (acpi_evalf(hkey_handle, &hkeyv, "MHKV", "qd")) {
|
|
|
+ if ((hkeyv >> 8) == 2) {
|
|
|
+ if (!acpi_evalf(hkey_handle,
|
|
|
+ NULL,
|
|
|
+ "STRW", "vd",
|
|
|
+ adaptive_keyboard_prev_mode)) {
|
|
|
+ pr_err("Cannot set adaptive keyboard mode.\n");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
/* procfs -------------------------------------------------------------- */
|