From patchwork Fri May 8 12:34:19 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: 226244 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, 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 22311C38A2A for ; Fri, 8 May 2020 12:47:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ED96E2495E for ; Fri, 8 May 2020 12:47:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588942038; bh=imHllWF0IkqPyAJK3PIZEqSeIRDsQqcMz00EYhA95eU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=eAp1b+/OkeRSHbPz5Hone8mQsu8k84APbfYnb6c8OYS537CQ2MWpRtJWttYqqFhxq XraIb0Fad7Ysk0vZ7n9lOLS5wuyHKIRTZrKykJh9iSMPCRxo0Bn1pOPbFxTO8mSsvG sE9zQi8MRNU6bKFQjS+9O33a16gEqymrJd2/4Grw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729524AbgEHMrP (ORCPT ); Fri, 8 May 2020 08:47:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:49456 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729231AbgEHMrO (ORCPT ); Fri, 8 May 2020 08:47:14 -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 526D121473; Fri, 8 May 2020 12:47:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588942033; bh=imHllWF0IkqPyAJK3PIZEqSeIRDsQqcMz00EYhA95eU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1vf/Up/QuOzNak28oi51q6ND44SJMFIt7Rr8y6DMeXEFLej8nSAbrUgSka4bQfnuH 0uXP/DjF0EPOYUZ7IAzs+axZwn2XnJifr3Fa+nm/St9KC1S64YiZOi4C9jxwUcFX4r fkvbBYvUVy1C2/9lvgljVcfnKYpnQNUklBOdgNzM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johan Hovold , "David S. Miller" Subject: [PATCH 4.4 268/312] net: ethernet: stmmac: dwmac-rk: fix probe error path Date: Fri, 8 May 2020 14:34:19 +0200 Message-Id: <20200508123143.283415866@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200508123124.574959822@linuxfoundation.org> References: <20200508123124.574959822@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: Johan Hovold commit 2d222656db08b8eef3b53b56cf1ce4a90fe8cd78 upstream. Make sure to disable runtime PM, power down the PHY, and disable clocks before returning on late probe errors. Fixes: 27ffefd2d109 ("stmmac: dwmac-rk: create a new probe function") Signed-off-by: Johan Hovold Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c @@ -600,7 +600,16 @@ static int rk_gmac_probe(struct platform if (ret) return ret; - return stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res); + ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res); + if (ret) + goto err_gmac_exit; + + return 0; + +err_gmac_exit: + rk_gmac_exit(pdev, plat_dat->bsp_priv); + + return ret; } static const struct of_device_id rk_gmac_dwmac_match[] = {