summaryrefslogtreecommitdiff
path: root/drivers/edac
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2015-01-28 22:13:51 +0300
committerBorislav Petkov <bp@suse.de>2015-01-30 19:00:43 +0300
commit30263b4052c6bf337641e24b64eaa87fe57adf8d (patch)
tree03bc61f99cc6a7f44ec0b1ff570cc91201a66761 /drivers/edac
parentf11135d87daebacd12e7bfb3ea66037ac9a167aa (diff)
downloadlinux-30263b4052c6bf337641e24b64eaa87fe57adf8d.tar.xz
EDAC, mv64x60_edac: Fix an error code in probe()
If edac_mc_add_mc() fails then we should preserve the error code, but instead the current code returns success. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Link: http://lkml.kernel.org/r/20150128191351.GC10259@mwanda Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'drivers/edac')
-rw-r--r--drivers/edac/mv64x60_edac.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/edac/mv64x60_edac.c b/drivers/edac/mv64x60_edac.c
index 6366e880f978..0574e1bbe45c 100644
--- a/drivers/edac/mv64x60_edac.c
+++ b/drivers/edac/mv64x60_edac.c
@@ -789,7 +789,8 @@ static int mv64x60_mc_err_probe(struct platform_device *pdev)
ctl = (ctl & 0xff00ffff) | 0x10000;
out_le32(pdata->mc_vbase + MV64X60_SDRAM_ERR_ECC_CNTL, ctl);
- if (edac_mc_add_mc(mci)) {
+ res = edac_mc_add_mc(mci);
+ if (res) {
edac_dbg(3, "failed edac_mc_add_mc()\n");
goto err;
}