Received: by 2002:a17:90a:1609:0:0:0:0 with SMTP id n9csp851332pja; Wed, 1 Apr 2020 09:50:33 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtl8M0uQG2SRrElepNvwrUT3MjmaAZ+j9gNo8mBC2iinZnPrrJdpa+KMP7moUZV6fMdrsk+ X-Received: by 2002:a9d:58c9:: with SMTP id s9mr15552741oth.99.1585759833141; Wed, 01 Apr 2020 09:50:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585759833; cv=none; d=google.com; s=arc-20160816; b=SFLHuUjmJm40UGdO1Mesvn0sMFGckuz08pCU0yIff1Gm+cSAehy3VjXth3NqtEmC/H DJpXnP0Nf1COnzjwZDFRQK+LU9WabRWgcJ2LIw9kWvhmwHrCjdsIi6g1ErvocJ833q4j LWi3XLfwyJWzAFuuDbST5LHtjGYxuuhZfnFFqQt5Ku9S2jO03plRmwFb1mWzZvWQ6RbT 7BibtgXFWuExQ9qWM96TfFtzAcjZpbNraWUtNNbzZOk43Ak5kkrO0eUOLwxBYDa4tGQR GMTa4dpt5EKDkIH8Euqz8gfSVmTc2kOK8wuDpCASnQPhBDLunqXDxvpLMc0uI+kImDNr 2Spg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Obc5LcoeEtr7SyLl/UaFIjEMOIg+WhqBNFRenUJ6euU=; b=Z1SDXwyRJ4EtL+mSHa/7+BYR9cYuhweUGwAVVjIrv/OmDz4SYSnbjGeTAQif/0oBpu PEjhr14VkzjMe+C0tuW6yhM+h8MNUKl3yflpmDiyx/bZyZzm3rye/nHmRAby9i9Dhnsm Uslqn4mQ8YrPD3imjkXot2Dy55+3UfUWnvpmO5iB+/M6Zeqk8Tstj3sT9wzz2V2itEzy 2cLhYyW7RPyMJatxD2XSTTXMIn6TjY4kddP2vff2ljofuXvvoWwVt80tFLgsG5rACAQO IIYE7k7QxuxvtlZ1wDZkcUKukv/xyg81V8c0oiHVP3RNqUX4A0IDHZbVav7zX+Us+auw jPxQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Wirpl6mG; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e53si1032311ote.156.2020.04.01.09.50.19; Wed, 01 Apr 2020 09:50:33 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Wirpl6mG; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389404AbgDAQtX (ORCPT + 99 others); Wed, 1 Apr 2020 12:49:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:43932 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388677AbgDAQnJ (ORCPT ); Wed, 1 Apr 2020 12:43:09 -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 5FC6520787; Wed, 1 Apr 2020 16:43:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585759388; bh=xEilnWJ17LjYXpfYjIrLh48O2kZon12YRiOCLDFS4mA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Wirpl6mGYTFFMRzdfx8QOlbxAHgOD0U4bVVSXMjoL0jyPmzXkg0/iXYAMR7us2CP8 pqyZPC1ZfPJZwW6fJPGx8eeeQ29m3dmGTDokSe8rdNn9rjY4nnBjr9Cftar+yicM/4 jpAZ5t5wODrcCTwe2mEpeVmIOYgvREwXaN9BCWao= 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.14 064/148] net: stmmac: dwmac-rk: fix error path in rk_gmac_probe Date: Wed, 1 Apr 2020 18:17:36 +0200 Message-Id: <20200401161559.861571306@linuxfoundation.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200401161552.245876366@linuxfoundation.org> References: <20200401161552.245876366@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 @@ -1362,7 +1362,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)