2022-12-11 07:09:52

by Christophe JAILLET

Subject: [PATCH] drm/msm/hdm: Fix the error handling path of msm_hdmi_dev_probe()

If an error occurs after a successful msm_hdmi_get_phy() call, it must be
undone by a corresponding msm_hdmi_put_phy(), as already done in the
remove function.

Fixes: 437365464043 ("drm/msm/hdmi: move msm_hdmi_get_phy() to msm_hdmi_dev_probe()")
Signed-off-by: Christophe JAILLET <[email protected]>
---
Not sure if the Fixes tag is correct. At least it is when the probe needs
to be fixed but the issue was maybe there elsewhere before.
---
drivers/gpu/drm/msm/hdmi/hdmi.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c
index 4d3fdc806bef..97372bb241d8 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi.c
@@ -532,11 +532,19 @@ static int msm_hdmi_dev_probe(struct platform_device *pdev)

ret = devm_pm_runtime_enable(&pdev->dev);
if (ret)
- return ret;
+ goto err_put_phy;

platform_set_drvdata(pdev, hdmi);

- return component_add(&pdev->dev, &msm_hdmi_ops);
+ ret = component_add(&pdev->dev, &msm_hdmi_ops);
+ if (ret)
+ goto err_put_phy;
+
+ return 0;
+
+err_put_phy:
+ msm_hdmi_put_phy(hdmi);
+ return ret;
}

static int msm_hdmi_dev_remove(struct platform_device *pdev)
--
2.34.1

2022-12-13 01:38:30

by Abhinav Kumar

Subject: Re: [PATCH] drm/msm/hdm: Fix the error handling path of msm_hdmi_dev_probe()

On 12/10/2022 10:50 PM, Christophe JAILLET wrote:
> If an error occurs after a successful msm_hdmi_get_phy() call, it must be
> undone by a corresponding msm_hdmi_put_phy(), as already done in the
> remove function.
>
> Fixes: 437365464043 ("drm/msm/hdmi: move msm_hdmi_get_phy() to msm_hdmi_dev_probe()")
> Signed-off-by: Christophe JAILLET <[email protected]>

Reviewed-by: Abhinav Kumar <[email protected]>

> ---
> Not sure if the Fixes tag is correct. At least it is when the probe needs
> to be fixed but the issue was maybe there elsewhere before.

Seems right to me.

> ---
> drivers/gpu/drm/msm/hdmi/hdmi.c | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c
> index 4d3fdc806bef..97372bb241d8 100644
> --- a/drivers/gpu/drm/msm/hdmi/hdmi.c
> +++ b/drivers/gpu/drm/msm/hdmi/hdmi.c
> @@ -532,11 +532,19 @@ static int msm_hdmi_dev_probe(struct platform_device *pdev)
>
> ret = devm_pm_runtime_enable(&pdev->dev);
> if (ret)
> - return ret;
> + goto err_put_phy;
>
> platform_set_drvdata(pdev, hdmi);
>
> - return component_add(&pdev->dev, &msm_hdmi_ops);
> + ret = component_add(&pdev->dev, &msm_hdmi_ops);
> + if (ret)
> + goto err_put_phy;
> +
> + return 0;
> +
> +err_put_phy:
> + msm_hdmi_put_phy(hdmi);
> + return ret;
> }
>
> static int msm_hdmi_dev_remove(struct platform_device *pdev)

2022-12-13 02:06:36

by Abhinav Kumar

Subject: Re: [Freedreno] [PATCH] drm/msm/hdm: Fix the error handling path of msm_hdmi_dev_probe()

On 12/12/2022 5:34 PM, Abhinav Kumar wrote:
>
>
> On 12/10/2022 10:50 PM, Christophe JAILLET wrote:
>> If an error occurs after a successful msm_hdmi_get_phy() call, it must be
>> undone by a corresponding msm_hdmi_put_phy(), as already done in the
>> remove function.
>>
>> Fixes: 437365464043 ("drm/msm/hdmi: move msm_hdmi_get_phy() to
>> msm_hdmi_dev_probe()")
>> Signed-off-by: Christophe JAILLET <[email protected]>
>
> Reviewed-by: Abhinav Kumar <[email protected]>

Actually, i missed one nit

In the subject line, it should be "drm/msm/hdmi"

The "i" is missing.

Please fix that and post it.

>
>> ---
>> Not sure if the Fixes tag is correct. At least it is when the probe needs
>> to be fixed but the issue was maybe there elsewhere before.
>
> Seems right to me.
>
>> ---
>>   drivers/gpu/drm/msm/hdmi/hdmi.c | 12 ++++++++++--
>>   1 file changed, 10 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c
>> b/drivers/gpu/drm/msm/hdmi/hdmi.c
>> index 4d3fdc806bef..97372bb241d8 100644
>> --- a/drivers/gpu/drm/msm/hdmi/hdmi.c
>> +++ b/drivers/gpu/drm/msm/hdmi/hdmi.c
>> @@ -532,11 +532,19 @@ static int msm_hdmi_dev_probe(struct
>> platform_device *pdev)
>>       ret = devm_pm_runtime_enable(&pdev->dev);
>>       if (ret)
>> -        return ret;
>> +        goto err_put_phy;
>>       platform_set_drvdata(pdev, hdmi);
>> -    return component_add(&pdev->dev, &msm_hdmi_ops);
>> +    ret = component_add(&pdev->dev, &msm_hdmi_ops);
>> +    if (ret)
>> +        goto err_put_phy;
>> +
>> +    return 0;
>> +
>> +err_put_phy:
>> +    msm_hdmi_put_phy(hdmi);
>> +    return ret;
>>   }
>>   static int msm_hdmi_dev_remove(struct platform_device *pdev)