summaryrefslogtreecommitdiffstats
path: root/include/acpi/pcc.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-11-01 07:47:40 +0100
committerIngo Molnar <mingo@kernel.org>2016-11-01 07:47:40 +0100
commitc29c716662d0cefc0cda4903aea5ed6794174679 (patch)
tree01d4dc47933e1bcbeca8d53b0cf5c1f70da04535 /include/acpi/pcc.h
parente63650840e8b053aa09ad934877e87e9941ed135 (diff)
parent405c0759712f57b680f66aee9c55cd06ad1cbdef (diff)
downloadlinux-c29c716662d0cefc0cda4903aea5ed6794174679.tar.bz2
Merge branch 'core/urgent' into x86/fpu, to merge fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/acpi/pcc.h')
-rw-r--r--include/acpi/pcc.h2
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