From patchwork Wed Jan 20 11:07:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pan Bian X-Patchwork-Id: 12032037 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.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 D1136C433DB for ; Wed, 20 Jan 2021 11:10:35 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6BF1522227 for ; Wed, 20 Jan 2021 11:10:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6BF1522227 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=163.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=+3EGK83CNc5J3PJ8mSqod79acw/HntW21nylWFiMKEI=; b=bIZTS0K7ffKUNnT7752CFHQimE m5GCpJhzNKaYUEEaKGbW9i4OCIcz8LH8Duh1tvNuvAfDTodS5BnZedA7tTo9vlbsCee0ajbPvb3kU Jl8Q1cbKybNV/7F0BO5AjD61iT05Zq7Jflm5OmWhqJbGP2HCuLZTWy6kZysJJm02kI/eP4omCXgGj Jok8UgsXPaPWdLC5cJvel0B882eSysJCivN2zXP9UITSTaREb6Rtw3Ly9kppE13to1BKF6VpCx/Oy a9JBbnFDbtyMq4/cKduzND+a4Bj1EOYKj86uEaV21q2dPmK3g4JMIm8gN2Sillod8I/AkuwfnO6RF SRF4RU3w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l2BMR-0005Mc-7X; Wed, 20 Jan 2021 11:09:15 +0000 Received: from m12-18.163.com ([220.181.12.18]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l2BM2-0005JB-Dy for linux-arm-kernel@lists.infradead.org; Wed, 20 Jan 2021 11:09:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=1gsABYDfG5RbJRuW+5 LcmE2LNHNvGErZzNpRw38meiQ=; b=c/Zp9QqjSTB/yeLxkozcmiAbVhQhKDoTMp RLn0+jUWSuLBWVO/fGCGoUEwqLYj9VdcjS/BzZZ3BbHqhCJDEZwjV1xvn88Q1Nbw Uq+qDIVfYNK93qoSRz72zWvZVyGOMtFyeTVorxKJ0fpNhv0Eb2HCTwyDgPyJFWOz BPog6bz+M= Received: from localhost.localdomain (unknown [119.3.119.20]) by smtp14 (Coremail) with SMTP id EsCowAAnOBgSDwhgjCFyQA--.58652S4; Wed, 20 Jan 2021 19:08:06 +0800 (CST) From: Pan Bian To: Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , "David S. Miller" , Jakub Kicinski , Maxime Coquelin , "Vineetha G. Jaya Kumaran" , Rusaimi Amira Ruslan Subject: [PATCH] net: stmmac: dwmac-intel-plat: remove config data on error Date: Wed, 20 Jan 2021 03:07:44 -0800 Message-Id: <20210120110745.36412-1-bianpan2016@163.com> X-Mailer: git-send-email 2.17.1 X-CM-TRANSID: EsCowAAnOBgSDwhgjCFyQA--.58652S4 X-Coremail-Antispam: 1Uf129KBjvdXoWrZrW7ZrW5GrWrAF4ktr43KFg_yoWDZFc_uF 1fZF9YqFW5Crs0yrW2vw43Z34F9F1qqr1SgFWkKaySvr9rWwn0qr97ZrnrXr4ku3yFyF9r Gr1xt3yxA34fKjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU5CksPUUUUU== X-Originating-IP: [119.3.119.20] X-CM-SenderInfo: held01tdqsiiqw6rljoofrz/xtbBZBYgclQHMDV47AAAsi X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210120_060913_479203_05B735D4 X-CRM114-Status: GOOD ( 12.20 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: netdev@vger.kernel.org, Pan Bian , linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Remove the config data when rate setting fails. Fixes: 9efc9b2b04c7 ("net: stmmac: Add dwmac-intel-plat for GBE driver") Signed-off-by: Pan Bian --- drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c index 82b1c7a5a7a9..ba0e4d2b256a 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c @@ -129,7 +129,7 @@ static int intel_eth_plat_probe(struct platform_device *pdev) if (ret) { dev_err(&pdev->dev, "Failed to set tx_clk\n"); - return ret; + goto err_remove_config_dt; } } } @@ -143,7 +143,7 @@ static int intel_eth_plat_probe(struct platform_device *pdev) if (ret) { dev_err(&pdev->dev, "Failed to set clk_ptp_ref\n"); - return ret; + goto err_remove_config_dt; } } }