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: ee8e41b5044f ("phy: ti: phy-da8xx-usb: Add runtime PM support")
Suggested-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Haotian Zhang <vulab@iscas.ac.cn>
---
Changes in v2:
  -Just return ret and drop the dev_err() as suggested by Neil
  Armstrong.
---
 drivers/phy/ti/phy-da8xx-usb.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/phy/ti/phy-da8xx-usb.c b/drivers/phy/ti/phy-da8xx-usb.c
index 1d81a1e6ec6b..62fa6f89c0e6 100644
--- a/drivers/phy/ti/phy-da8xx-usb.c
+++ b/drivers/phy/ti/phy-da8xx-usb.c
@@ -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.
-- 
2.50.1.windows.1

On 11/24/25 11:57, Haotian Zhang wrote:
> 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: ee8e41b5044f ("phy: ti: phy-da8xx-usb: Add runtime PM support")
> Suggested-by: Neil Armstrong <neil.armstrong@linaro.org>
> Signed-off-by: Haotian Zhang <vulab@iscas.ac.cn>
> ---
> Changes in v2:
>    -Just return ret and drop the dev_err() as suggested by Neil
>    Armstrong.
> ---
>   drivers/phy/ti/phy-da8xx-usb.c | 7 ++++---
>   1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/phy/ti/phy-da8xx-usb.c b/drivers/phy/ti/phy-da8xx-usb.c
> index 1d81a1e6ec6b..62fa6f89c0e6 100644
> --- a/drivers/phy/ti/phy-da8xx-usb.c
> +++ b/drivers/phy/ti/phy-da8xx-usb.c
> @@ -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.

Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>