Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp1109749iob; Wed, 4 May 2022 15:00:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxucvHpPPjDB0KEEUdN9ggMvBaDneG00R0WZ9hWgha5pedasI/9WCj2RWWB2A76igNeHoEU X-Received: by 2002:a05:6402:5243:b0:427:caa4:f75 with SMTP id t3-20020a056402524300b00427caa40f75mr17329349edd.153.1651701619245; Wed, 04 May 2022 15:00:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651701619; cv=none; d=google.com; s=arc-20160816; b=nFSJXItC/A13vruJBPozoFFMqqGYB85Ei6WOpJAnzAu7ZmIpw00X7fXA13rPqvvfTG b2BJS6sR/uSgU5mA3Mszh7otu/Uz/6sl9r+mLgPc53aSRDKlWv8tJ1fkmLhliHJUgli9 EcgPefzU++GN6d62sPY37dwtEbdDfA7ey5UTHb5kKmwep5srVwieN4L332lD8nWgT3cf wFnXqJ1fjzS1QL2mfRwL9IcfF6r036WscPDqSQKPE3KRb2bO1zBSpzG7avJRwqTQXC/k z13E0xH5uCO8WBQkm+A+t6ZgmclmOzI4ENu0DC9Z0iV2UD+UTER4TCCghmjbk+PVgHxm /S6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=K5+Pjz1I5i3+e4d0JyvqNvzTFnASLc36F3XXchcCSs0=; b=OM6pakKz19WRghtm9kps0rqrZoK70Uh/tQjmy4Cl/TgxFqJLx6EWiXsyBuzkTcsaAL HNO2GpZCpPTeVNQfPGeMkPHTybAJFSLvOEKzNT+T6kzWfdG/Tw3axJFUWVPWzi0WsuGd Db8xgWJeqIW6Q+/GMDBybBa1ADphWTwvLG1rY2CY2jlsTFX9LzmdUGPZXhwepUaWqDLg 047YZY4Mbrk5W8nOBuWyW8soz3uUFMlJ8ItF7M/cufY8eOImQb/5A5tXecfTL7+Wjo6q UNqQCidWtIi0ocunpHecifL21FYTfcPohrAuF6J2vdp/pkx+7xj8IBD0JZu3iLWeZfjT W9pA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=F5CoNnl2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i5-20020a50fc05000000b00425b8cd99c0si2952523edr.370.2022.05.04.14.59.54; Wed, 04 May 2022 15:00:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=F5CoNnl2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1359091AbiEDRfr (ORCPT + 99 others); Wed, 4 May 2022 13:35:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40998 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356983AbiEDRJw (ORCPT ); Wed, 4 May 2022 13:09:52 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8BA114830B; Wed, 4 May 2022 09:56:53 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id F22C5B827A3; Wed, 4 May 2022 16:56:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A15DBC385A5; Wed, 4 May 2022 16:56:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1651683410; bh=ILpcJ1EnEQUwhSywYQ3IAqyxmDYiAyN1DkLdFFHSEvU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F5CoNnl27rR9eOUEV65JcK9fdfJ8/iWGdgtpeg/Z/XYie8jcDiimz5sjBp7FHQt3d ZIXpB4XyDOlwg9ohzGlIYFZg4ZZzv7Cz1sB9+VEc3+6D7G35pVCoIR3V3Ch17m/kMt ktgNWpGyIkXvR7Ye/bXTDda3ch197ixCR58zCagQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Heiner Kallweit , Vinod Koul , Sasha Levin Subject: [PATCH 5.17 095/225] phy: amlogic: fix error path in phy_g12a_usb3_pcie_probe() Date: Wed, 4 May 2022 18:45:33 +0200 Message-Id: <20220504153119.292839850@linuxfoundation.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220504153110.096069935@linuxfoundation.org> References: <20220504153110.096069935@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Heiner Kallweit [ Upstream commit 2c8045d48dee703ad8eab2be7d6547765a89c069 ] If clk_prepare_enable() fails we call clk_disable_unprepare() in the error path what results in a warning that the clock is disabled and unprepared already. And if we fail later in phy_g12a_usb3_pcie_probe() then we bail out w/o calling clk_disable_unprepare(). This patch fixes both errors. Fixes: 36077e16c050 ("phy: amlogic: Add Amlogic G12A USB3 + PCIE Combo PHY Driver") Signed-off-by: Heiner Kallweit Link: https://lore.kernel.org/r/8e416f95-1084-ee28-860e-7884f7fa2e32@gmail.com Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- .../phy/amlogic/phy-meson-g12a-usb3-pcie.c | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c b/drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c index 5b471ab80fe2..54d65a6f0fcc 100644 --- a/drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c +++ b/drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c @@ -414,19 +414,19 @@ static int phy_g12a_usb3_pcie_probe(struct platform_device *pdev) ret = clk_prepare_enable(priv->clk_ref); if (ret) - goto err_disable_clk_ref; + return ret; priv->reset = devm_reset_control_array_get_exclusive(dev); - if (IS_ERR(priv->reset)) - return PTR_ERR(priv->reset); + if (IS_ERR(priv->reset)) { + ret = PTR_ERR(priv->reset); + goto err_disable_clk_ref; + } priv->phy = devm_phy_create(dev, np, &phy_g12a_usb3_pcie_ops); if (IS_ERR(priv->phy)) { ret = PTR_ERR(priv->phy); - if (ret != -EPROBE_DEFER) - dev_err(dev, "failed to create PHY\n"); - - return ret; + dev_err_probe(dev, ret, "failed to create PHY\n"); + goto err_disable_clk_ref; } phy_set_drvdata(priv->phy, priv); @@ -434,8 +434,12 @@ static int phy_g12a_usb3_pcie_probe(struct platform_device *pdev) phy_provider = devm_of_phy_provider_register(dev, phy_g12a_usb3_pcie_xlate); + if (IS_ERR(phy_provider)) { + ret = PTR_ERR(phy_provider); + goto err_disable_clk_ref; + } - return PTR_ERR_OR_ZERO(phy_provider); + return 0; err_disable_clk_ref: clk_disable_unprepare(priv->clk_ref); -- 2.35.1