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 9D3B5C433E3 for ; Mon, 27 Jul 2020 14:21:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7D3572070B for ; Mon, 27 Jul 2020 14:21:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595859691; bh=DafwVra6R15YiKS3P4lQV5RXKI9bC2rto+ReRK0TKTw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=sRtdZWcpsFqPiVtZn7cSxa/EDVCeNklwcVc0aYGkS+ZeC0gPwNByhTb90jelJzKCV +8iyprBKCllI1s3IkAY8DtFW4Oh3KFtId3+xrMcv4LtGNy5MMqsS5+hSi2NDt33tya bBocUyQyFNZDwmpGHwCXuKOCxZdg6uQY9P+cDxNQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730043AbgG0OVa (ORCPT ); Mon, 27 Jul 2020 10:21:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:50062 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730258AbgG0OV2 (ORCPT ); Mon, 27 Jul 2020 10:21:28 -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 6A34D2070B; Mon, 27 Jul 2020 14:21:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595859688; bh=DafwVra6R15YiKS3P4lQV5RXKI9bC2rto+ReRK0TKTw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ww5dUR8PsFuibZATpuAoG/pTJ9Ys5dS0KwZz6CoXrIJO37x9MtnWuVAddHs6M26z8 1annWHdwTqdapmksBF7+d+WCQVVaFCVh7WLvjyKMLX5QBIINcGbjP7xXzMMbZZ3jXY r/vG2CoCV3JVo/d9fRh8fwVo0DUWVtAmL1qiEhQk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Zhang Changzhong , Doug Berger , Florian fainelli , "David S. Miller" , Sasha Levin Subject: [PATCH 5.7 067/179] net: bcmgenet: fix error returns in bcmgenet_probe() Date: Mon, 27 Jul 2020 16:04:02 +0200 Message-Id: <20200727134935.932943126@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200727134932.659499757@linuxfoundation.org> References: <20200727134932.659499757@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: Zhang Changzhong [ Upstream commit 24a63fe6d45d6527db5ab87bcd1da6921f10e89e ] The driver forgets to call clk_disable_unprepare() in error path after a success calling for clk_prepare_enable(). Fix to goto err_clk_disable if clk_prepare_enable() is successful. Fixes: 99d55638d4b0 ("net: bcmgenet: enable NETIF_F_HIGHDMA flag") Signed-off-by: Zhang Changzhong Acked-by: Doug Berger Acked-by: Florian fainelli Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c index dde1c23c8e399..7b95bb77ad3bb 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -3522,7 +3522,7 @@ static int bcmgenet_probe(struct platform_device *pdev) if (err) err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); if (err) - goto err; + goto err_clk_disable; /* Mii wait queue */ init_waitqueue_head(&priv->wq); -- 2.25.1