From patchwork Tue Mar 31 08:57:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 228681 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.9 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 847BCC43331 for ; Tue, 31 Mar 2020 09:05:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4FEB720675 for ; Tue, 31 Mar 2020 09:05:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585645518; bh=TBcOzdlkBS4YbY4gK3VVWnQ8aiNxZfo4NGJlloFDJbs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=HV+woIZWRmEq7ZIVR204FkJthVQCm7ZFcofmXHFAxHiX7r8Xb+nkl7WHTTodjhjyG t2ZolIwTUBERWTkmn1MH/zJs6eHOxv0Fgbnh7L6evwtMcxijMXknvTvQ4mPiJLJ8jI sT3Z+22mbNnK6grXw9QGNuKFkFpt2NbAAnRmKZ1s= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731013AbgCaJE4 (ORCPT ); Tue, 31 Mar 2020 05:04:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:45708 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730549AbgCaJEz (ORCPT ); Tue, 31 Mar 2020 05:04: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 A208520787; Tue, 31 Mar 2020 09:04:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585645495; bh=TBcOzdlkBS4YbY4gK3VVWnQ8aiNxZfo4NGJlloFDJbs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NdfPgfSJBPuG82tbzWBrvz0OIeL95iPN+5G9K71EtSfyj47CFapdPCP8GIdJ4m9Wk 0tT5zMoZ2AYjf7ASTDqlPVXGMHGuT/IfsceiKI6B41vBx+mvstbxd7lPGTr0bpGe0u MpA+JpM5AM9Gj2SSAkdJtfoi9XphnN0ul7gxJy4M= 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 5.5 032/170] net: stmmac: dwmac-rk: fix error path in rk_gmac_probe Date: Tue, 31 Mar 2020 10:57:26 +0200 Message-Id: <20200331085427.470541620@linuxfoundation.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200331085423.990189598@linuxfoundation.org> References: <20200331085423.990189598@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 @@ -1411,7 +1411,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)