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 0AB70C433E8 for ; Mon, 27 Jul 2020 14:35:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D330F21775 for ; Mon, 27 Jul 2020 14:35:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595860531; bh=seLMt84wcUrmJjUxZt3Ye4PSZv7NKEZVGbdSo83/pa0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Swr/CHYThYus6Qm1avzbLj/57Mpe1hwG7VgEK3qIv/BN7xPaE+L31CJnDm6xfM07Z p/xmVcCs+pDrvNtuTQsrfBQU3xMH0Z0J1dIH4V/SaBSwPw52Dl2/5HrDdtkpeJbaj/ a++Qo4F56luErvBiAJSy0az1b4F3wh68lKKHtNIk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730618AbgG0OOz (ORCPT ); Mon, 27 Jul 2020 10:14:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:40918 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730616AbgG0OOz (ORCPT ); Mon, 27 Jul 2020 10:14:55 -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 2772721744; Mon, 27 Jul 2020 14:14:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595859294; bh=seLMt84wcUrmJjUxZt3Ye4PSZv7NKEZVGbdSo83/pa0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BCQXaE8d4QvcVeXN+LOd02Am3rA3Vr9QacNVdX5snjz9H4WAjQfihbL9Hk4KJVjqP a8iLJI7iwU/a8g78UXW5xAZ1uScsCY3fXQquVmIid72/GoVwnvM7Xom/ehGvAtLk+D 3xepr+CgluldR+5zoUcytAkabS894O+dyMlkCPlQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hulk Robot , Huang Guobin , "David S. Miller" , Sasha Levin Subject: [PATCH 5.4 053/138] net: ag71xx: add missed clk_disable_unprepare in error path of probe Date: Mon, 27 Jul 2020 16:04:08 +0200 Message-Id: <20200727134928.011981090@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: Huang Guobin [ Upstream commit befc113c56a76ae7be3986034a0e476d3385e265 ] The ag71xx_mdio_probe() forgets to call clk_disable_unprepare() when of_reset_control_get_exclusive() failed. Add the missed call to fix it. Fixes: d51b6ce441d3 ("net: ethernet: add ag71xx driver") Reported-by: Hulk Robot Signed-off-by: Huang Guobin Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/atheros/ag71xx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/atheros/ag71xx.c b/drivers/net/ethernet/atheros/ag71xx.c index 1b1a09095c0dc..78e20f53677d5 100644 --- a/drivers/net/ethernet/atheros/ag71xx.c +++ b/drivers/net/ethernet/atheros/ag71xx.c @@ -553,7 +553,8 @@ static int ag71xx_mdio_probe(struct ag71xx *ag) ag->mdio_reset = of_reset_control_get_exclusive(np, "mdio"); if (IS_ERR(ag->mdio_reset)) { netif_err(ag, probe, ndev, "Failed to get reset mdio.\n"); - return PTR_ERR(ag->mdio_reset); + err = PTR_ERR(ag->mdio_reset); + goto mdio_err_put_clk; } mii_bus->name = "ag71xx_mdio"; -- 2.25.1