diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-06-19 05:47:02 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-06-19 05:47:02 +0300 |
| commit | adc2e56ebe6377f5c032d96aee0feac30a640453 (patch) | |
| tree | f8937ffc72e1991418b0d54a0672766237855c94 /drivers/acpi/sleep.c | |
| parent | 4bea7207a80c8bba3b3eb5b84c407b162968475f (diff) | |
| parent | 9ed13a17e38e0537e24d9b507645002bf8d0201f (diff) | |
| download | linux-adc2e56ebe6377f5c032d96aee0feac30a640453.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Trivial conflicts in net/can/isotp.c and
tools/testing/selftests/net/mptcp/mptcp_connect.sh
scaled_ppm_to_ppb() was moved from drivers/ptp/ptp_clock.c
to include/linux/ptp_clock_kernel.h in -next so re-apply
the fix there.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/acpi/sleep.c')
| -rw-r--r-- | drivers/acpi/sleep.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index 09fd13757b65..3bb2adef8490 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c @@ -504,7 +504,7 @@ static void acpi_pm_start(u32 acpi_state) */ static void acpi_pm_end(void) { - acpi_turn_off_unused_power_resources(); + acpi_turn_off_unused_power_resources(false); acpi_scan_lock_release(); /* * This is necessary in case acpi_pm_finish() is not called during a @@ -1009,10 +1009,8 @@ static void acpi_sleep_hibernate_setup(void) return; acpi_get_table(ACPI_SIG_FACS, 1, (struct acpi_table_header **)&facs); - if (facs) { + if (facs) s4_hardware_signature = facs->hardware_signature; - acpi_put_table((struct acpi_table_header *)facs); - } } #else /* !CONFIG_HIBERNATION */ static inline void acpi_sleep_hibernate_setup(void) {} |