diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2016-10-21 15:54:45 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-10-21 15:54:45 -0700
commit43ef55daa7063fbf70c0cafacf58901c0f4a8f49 (patch)
parent6edc51a8d43b0bb8263fefaa8eb0cf62e8499978 (diff)
parent956c8974da654016ec26e66322b5b221108468bf (diff)
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()
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/watchdog/wdat_wdt.c b/drivers/watchdog/wdat_wdt.c
index e473e3b23720..6d1fbda0f461 100644
--- a/drivers/watchdog/wdat_wdt.c
+++ b/drivers/watchdog/wdat_wdt.c
@@ -499,6 +499,10 @@ static int wdat_wdt_resume_noirq(struct device *dev)
ret = wdat_wdt_enable_reboot(wdat);
if (ret)
return ret;
+ ret = wdat_wdt_ping(&wdat->wdd);
+ if (ret)
+ return ret;
return wdat_wdt_start(&wdat->wdd);
diff --git a/include/acpi/pcc.h b/include/acpi/pcc.h
index 17a940a14477..8caa79c61703 100644
--- a/include/acpi/pcc.h
+++ b/include/acpi/pcc.h
@@ -21,7 +21,7 @@ extern void pcc_mbox_free_channel(struct mbox_chan *chan);
static inline struct mbox_chan *pcc_mbox_request_channel(struct mbox_client *cl,
int subspace_id)
- return NULL;
+ return ERR_PTR(-ENODEV);
static inline void pcc_mbox_free_channel(struct mbox_chan *chan) { }