From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 00001C433EA for ; Mon, 27 Jul 2020 14:15:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C5C3E20838 for ; Mon, 27 Jul 2020 14:15:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595859322; bh=LvnyYxvjXdHcMbft6ooLrDkrVOamx3GpTTFhktluOso=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=yanXtTWzoEI/m93UX/vBWrrnVrX1DxT51rbfI3pRqWwGwJRIu3b07FtEdcB4wh2RM Q81/vNqAA22/gFsC5nk38NTwv9ibHT+HLbQ43rFHki7ZEIisrtaayB686O2vgxfhDO Vc7TLdNK+yhoR5OIyyt8kgM+ikpfIg8GQQ+UtiMA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730678AbgG0OPQ (ORCPT ); Mon, 27 Jul 2020 10:15:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:41510 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730673AbgG0OPP (ORCPT ); Mon, 27 Jul 2020 10:15:15 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B435522C9E; Mon, 27 Jul 2020 14:15:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595859315; bh=LvnyYxvjXdHcMbft6ooLrDkrVOamx3GpTTFhktluOso=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MsuiE6l7O1PEdg9YlGkC/SDIUQWgCXIHh9EUbin5p3bfV7nud5kCjIM1iayrx8NRl nEuIEbGsIzZBlnGdDQKYr7tjMP055a8BCQbAgaU2e3644Emu6/XfYNKyk6VXaM+M82 AVl8B7Le8q3xh7t4gWIPoMiBJSZUCYkUXtnmmxZk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hulk Robot , Wang Hai , Kunihiko Hayashi , "David S. Miller" , Sasha Levin Subject: [PATCH 5.4 060/138] net: ethernet: ave: Fix error returns in ave_init Date: Mon, 27 Jul 2020 16:04:15 +0200 Message-Id: <20200727134928.410814754@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200727134925.228313570@linuxfoundation.org> References: <20200727134925.228313570@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Wang Hai [ Upstream commit 1264d7fa3a64d8bea7aebb77253f917947ffda25 ] When regmap_update_bits failed in ave_init(), calls of the functions reset_control_assert() and clk_disable_unprepare() were missed. Add goto out_reset_assert to do this. Fixes: 57878f2f4697 ("net: ethernet: ave: add support for phy-mode setting of system controller") Reported-by: Hulk Robot Signed-off-by: Wang Hai Reviewed-by: Kunihiko Hayashi Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/socionext/sni_ave.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/socionext/sni_ave.c b/drivers/net/ethernet/socionext/sni_ave.c index 38d39c4b5ac83..603d54f83399c 100644 --- a/drivers/net/ethernet/socionext/sni_ave.c +++ b/drivers/net/ethernet/socionext/sni_ave.c @@ -1191,7 +1191,7 @@ static int ave_init(struct net_device *ndev) ret = regmap_update_bits(priv->regmap, SG_ETPINMODE, priv->pinmode_mask, priv->pinmode_val); if (ret) - return ret; + goto out_reset_assert; ave_global_reset(ndev); -- 2.25.1