summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2016-12-09 13:48:55 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2016-12-09 13:48:55 +1100
commit9deca3384d627f968b475eed923d06e04ce65646 (patch)
tree7dc3f8d19737c2356b89b62f444f52ebef0b93e8
parent36829b43e0048654036d1c17853dcbca3a5443d1 (diff)
parent0de2788447b67891a31a156c0206fd159e4a8981 (diff)
Merge remote-tracking branch 'edac-amd/for-next'
-rw-r--r--drivers/edac/amd64_edac.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index 9a7cf3c8df06..260251177830 100644
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -2913,7 +2913,7 @@ static int toggle_ecc_err_reporting(struct ecc_settings *s, u16 nid, bool on)
if (!zalloc_cpumask_var(&cmask, GFP_KERNEL)) {
amd64_warn("%s: error allocating mask\n", __func__);
- return false;
+ return -ENOMEM;
}
get_cpus_on_this_dct_cpumask(cmask, nid);