tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'acpi-4.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull ACPI fixes from Rafael Wysocki:
"These fix an issue related to system resume in the new WDAT-based
watchdog driver and a return value of a stub function in the ACPI CPPC
framework.

Specifics:

- Update the ACPI WDAT-based watchdog driver to ping the hardware
during system resume to prevent a reset from occurring after the
resume is complete (Mika Westerberg).

- Fix the return value of the pcc_mbox_request_channel() stub for
CONFIG_PCC unset (Hoan Tran)"

* tag 'acpi-4.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
watchdog: wdat_wdt: Ping the watchdog on resume
mailbox: PCC: Fix return value of pcc_mbox_request_channel()

Linus Torvalds 43ef55da 6edc51a8

+5 -1
+4
drivers/watchdog/wdat_wdt.c
··· 499 499 ret = wdat_wdt_enable_reboot(wdat); 500 500 if (ret) 501 501 return ret; 502 + 503 + ret = wdat_wdt_ping(&wdat->wdd); 504 + if (ret) 505 + return ret; 502 506 } 503 507 504 508 return wdat_wdt_start(&wdat->wdd);
+1 -1
include/acpi/pcc.h
··· 21 21 static inline struct mbox_chan *pcc_mbox_request_channel(struct mbox_client *cl, 22 22 int subspace_id) 23 23 { 24 - return NULL; 24 + return ERR_PTR(-ENODEV); 25 25 } 26 26 static inline void pcc_mbox_free_channel(struct mbox_chan *chan) { } 27 27 #endif