From patchwork Wed Apr 1 16:16:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 228292 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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, 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 69E42C43331 for ; Wed, 1 Apr 2020 16:55:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3177920714 for ; Wed, 1 Apr 2020 16:55:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585760152; bh=6gn4xLYGX2xRiF/UKHOBlbktKkIgVnqW76JdZH6pI3g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=c/ACpxWgjmqU3hY6WeeKXpFRM0FCZWIBbjrs7pyDXcYSgwH5lF3d2QvlcV9MPkQmt FPzZ9g+gTefrVLy+lRQ+r9hXLtn/pQY2vCZxwcOWng0jUH8PIa0tchTpIVCf9GPYrI Qys2FFBpEJppB2D+JxutbaV23lU2YMzYUga3UgIo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387593AbgDAQX3 (ORCPT ); Wed, 1 Apr 2020 12:23:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:46754 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732304AbgDAQX2 (ORCPT ); Wed, 1 Apr 2020 12:23: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 D98AD212CC; Wed, 1 Apr 2020 16:23:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585758207; bh=6gn4xLYGX2xRiF/UKHOBlbktKkIgVnqW76JdZH6pI3g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p+0Z86Hn4r7EwLPvueLpWzKXV4hB9nB51wcyPqohOrEsMTXtr4njTTZddfpv24tGt b4e+Qy2WzLTD87KYu4x38WUxnbiX0F7hLvLeNc3NtEuJLssN7PUUnsxgvkk60f5TZS h9te0fenTbLXphXvmovBUw326TGaCgv3hv07olw0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Emil Renner Berthing , "David S. Miller" Subject: [PATCH 4.19 018/116] net: stmmac: dwmac-rk: fix error path in rk_gmac_probe Date: Wed, 1 Apr 2020 18:16:34 +0200 Message-Id: <20200401161544.538296512@linuxfoundation.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200401161542.669484650@linuxfoundation.org> References: <20200401161542.669484650@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Emil Renner Berthing [ Upstream commit 9de9aa487daff7a5c73434c24269b44ed6a428e6 ] Make sure we clean up devicetree related configuration also when clock init fails. Fixes: fecd4d7eef8b ("net: stmmac: dwmac-rk: Add integrated PHY support") Signed-off-by: Emil Renner Berthing Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c @@ -1420,7 +1420,7 @@ static int rk_gmac_probe(struct platform ret = rk_gmac_clk_init(plat_dat); if (ret) - return ret; + goto err_remove_config_dt; ret = rk_gmac_powerup(plat_dat->bsp_priv); if (ret)