diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-21 15:54:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-21 15:54:45 -0700 |
| commit | 43ef55daa7063fbf70c0cafacf58901c0f4a8f49 (patch) | |
| tree | a386a723c1232a6bea84e7b5b87a18553424b6f2 /include | |
| parent | Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi (diff) | |
| parent | Merge branches 'acpi-wdat' and 'acpi-cppc' (diff) | |
| download | linux-dev-43ef55daa7063fbf70c0cafacf58901c0f4a8f49.tar.xz linux-dev-43ef55daa7063fbf70c0cafacf58901c0f4a8f49.zip | |
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()
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/pcc.h | 2 |
1 files changed, 1 insertions, 1 deletions
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) { } #endif |