| From foo@baz Mon Apr 9 17:09:24 CEST 2018 |
| From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| Date: Sun, 7 Jan 2018 21:54:00 +0100 |
| Subject: EDAC, mv64x60: Fix an error handling path |
| |
| From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| |
| |
| [ Upstream commit 68fa24f9121c04ef146b5158f538c8b32f285be5 ] |
| |
| We should not call edac_mc_del_mc() if a corresponding call to |
| edac_mc_add_mc() has not been performed yet. |
| |
| So here, we should go to err instead of err2 to branch at the right |
| place of the error handling path. |
| |
| Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| Cc: linux-edac <linux-edac@vger.kernel.org> |
| Link: http://lkml.kernel.org/r/20180107205400.14068-1-christophe.jaillet@wanadoo.fr |
| Signed-off-by: Borislav Petkov <bp@suse.de> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/edac/mv64x60_edac.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/edac/mv64x60_edac.c |
| +++ b/drivers/edac/mv64x60_edac.c |
| @@ -759,7 +759,7 @@ static int mv64x60_mc_err_probe(struct p |
| /* Non-ECC RAM? */ |
| printk(KERN_WARNING "%s: No ECC DIMMs discovered\n", __func__); |
| res = -ENODEV; |
| - goto err2; |
| + goto err; |
| } |
| |
| edac_dbg(3, "init mci\n"); |
