From patchwork Mon Aug 24 08:30:41 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: 265047 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.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, 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 A6CDBC433DF for ; Mon, 24 Aug 2020 09:35:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 765F5206F0 for ; Mon, 24 Aug 2020 09:35:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598261719; bh=Z2BaQpAKYv9JDob0kBSAPrWAG5hENYzWb+eB29KmjUo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=URBGYiueMMX/uIHIV+A80L2C+DIA/a/CaZUOusb3IEqwUaWcEowe55qI2KopIUl8N VC4IJd++zVnXx+aF+cq+k8s0Ybn8jXlMfDehoQsFrwTjMVW9J/xzqFupOD5wMdIILM EQ+dXb+bu+bgIJxhv709yOn1mB7CEtUft3gsI9ak= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729679AbgHXItP (ORCPT ); Mon, 24 Aug 2020 04:49:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:51218 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729646AbgHXItL (ORCPT ); Mon, 24 Aug 2020 04:49:11 -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 A70C8204FD; Mon, 24 Aug 2020 08:49:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598258951; bh=Z2BaQpAKYv9JDob0kBSAPrWAG5hENYzWb+eB29KmjUo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uu+ZGZz5rio4s4iJpdii3P1qli/9FR/Q6b6HNIdnZ2UsGb/2JoozlG1eBJTueIGsu QPbIDjx12Ee0PLRDAF8FXLmxk9EwKumozFT3mLKbMLqRWuxQ3uk/VDZY9hyfW8gquB XC0kFgym56znpkqaesRVDlcPYJsgSGeJ2pjsJSRc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Fugang Duan , "David S. Miller" , Sasha Levin Subject: [PATCH 5.4 075/107] net: fec: correct the error path for regulator disable in probe Date: Mon, 24 Aug 2020 10:30:41 +0200 Message-Id: <20200824082408.833409792@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200824082405.020301642@linuxfoundation.org> References: <20200824082405.020301642@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: Fugang Duan [ Upstream commit c6165cf0dbb82ded90163dce3ac183fc7a913dc4 ] Correct the error path for regulator disable. Fixes: 9269e5560b26 ("net: fec: add phy-reset-gpios PROBE_DEFER check") Signed-off-by: Fugang Duan Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/freescale/fec_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index 39c112f1543c1..a0e4b12ac4ea2 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -3707,11 +3707,11 @@ fec_probe(struct platform_device *pdev) failed_irq: failed_init: fec_ptp_stop(pdev); - if (fep->reg_phy) - regulator_disable(fep->reg_phy); failed_reset: pm_runtime_put_noidle(&pdev->dev); pm_runtime_disable(&pdev->dev); + if (fep->reg_phy) + regulator_disable(fep->reg_phy); failed_regulator: clk_disable_unprepare(fep->clk_ahb); failed_clk_ahb: