Commit 08aa19de authored by Haotian Zhang's avatar Haotian Zhang Committed by Vinod Koul
Browse files

phy: ti: da8xx-usb: Handle devm_pm_runtime_enable() errors 



devm_pm_runtime_enable() can fail due to memory allocation. The current
code ignores its return value after calling pm_runtime_set_active(),
leaving the device in an inconsistent state if runtime PM initialization
fails.

Check the return value of devm_pm_runtime_enable() and return on
failure. Also move the declaration of 'ret' to the function scope
to support this check.

Fixes: ee8e41b5 ("phy: ti: phy-da8xx-usb: Add runtime PM support")
Suggested-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: default avatarHaotian Zhang <vulab@iscas.ac.cn>
Reviewed-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Link: https://patch.msgid.link/20251124105734.1027-1-vulab@iscas.ac.cn


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent cabd25b5

drivers/phy/ti/phy-da8xx-usb.c

+4 −3
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ static int da8xx_usb_phy_probe(struct platform_device *pdev) 
	struct da8xx_usb_phy_platform_data *pdata = dev->platform_data;

	struct device_node	*node = dev->of_node;

	struct da8xx_usb_phy	*d_phy;

	int ret;



	d_phy = devm_kzalloc(dev, sizeof(*d_phy), GFP_KERNEL);

	if (!d_phy)
@@ -233,8 +234,6 @@ static int da8xx_usb_phy_probe(struct platform_device *pdev) 
			return PTR_ERR(d_phy->phy_provider);

		}

	} else {

		int ret;



		ret = phy_create_lookup(d_phy->usb11_phy, "usb-phy",

					"ohci-da8xx");

		if (ret)
@@ -249,7 +248,9 @@ static int da8xx_usb_phy_probe(struct platform_device *pdev) 
			  PHY_INIT_BITS, PHY_INIT_BITS);



	pm_runtime_set_active(dev);

	devm_pm_runtime_enable(dev);

	ret = devm_pm_runtime_enable(dev);

	if (ret)

		return ret;

	/*

	 * Prevent runtime pm from being ON by default. Users can enable

	 * it using power/control in sysfs.