lkml.org 
[lkml]   [2018]   [Apr]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 066/138] EDAC, mv64x60: Fix an error handling path
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    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
    @@ -758,7 +758,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");

    \
     
     \ /
      Last update: 2018-04-11 00:58    [W:2.745 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site