diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-07-08 10:51:25 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-07-08 10:51:25 +0200 |
| commit | 3dbeb448543efc01f04cadd6d358b9f33dd20d31 (patch) | |
| tree | fb0c912f3f36680a9f8fcd0041f6e1a922f1690d /drivers/input | |
| parent | Merge branches 'acpi-pm' and 'pm-pci' (diff) | |
| parent | PM: sleep: Drop dev_pm_skip_next_resume_phases() (diff) | |
| download | linux-dev-3dbeb448543efc01f04cadd6d358b9f33dd20d31.tar.xz linux-dev-3dbeb448543efc01f04cadd6d358b9f33dd20d31.zip | |
Merge branch 'pm-sleep'
* pm-sleep:
PM: sleep: Drop dev_pm_skip_next_resume_phases()
ACPI: PM: Drop unused function and function header
ACPI: PM: Introduce "poweroff" callbacks for ACPI PM domain and LPSS
ACPI: PM: Simplify and fix PM domain hibernation callbacks
PCI: PM: Simplify bus-level hibernation callbacks
PM: ACPI/PCI: Resume all devices during hibernation
kernel: power: swap: use kzalloc() instead of kmalloc() followed by memset()
PM: sleep: Update struct wakeup_source documentation
drivers: base: power: remove wakeup_sources_stats_dentry variable
PM: suspend: Rename pm_suspend_via_s2idle()
PM: sleep: Show how long dpm_suspend_start() and dpm_suspend_end() take
PM: hibernate: powerpc: Expose pfn_is_nosave() prototype
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/serio/i8042.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c index e4352741c467..b695094290ab 100644 --- a/drivers/input/serio/i8042.c +++ b/drivers/input/serio/i8042.c @@ -1406,7 +1406,7 @@ static void __init i8042_register_ports(void) * behavior on many platforms using suspend-to-RAM (ACPI S3) * by default. */ - if (pm_suspend_via_s2idle() && i == I8042_KBD_PORT_NO) + if (pm_suspend_default_s2idle() && i == I8042_KBD_PORT_NO) device_set_wakeup_enable(&serio->dev, true); } } |