[PATCH] drm/bridge: use devm_add_action_or_reset() to handle failed condition
Laurent Pinchart
laurent.pinchart at ideasonboard.com
Wed Dec 16 14:11:41 UTC 2020
Hi Tian,
Thank you for the patch.
On Wed, Dec 16, 2020 at 08:22:32PM +0800, Tian Tao wrote:
> switch to using devm_add_action_or_reset() instead of devm_add_action to
> avoid call the cec_delete_adapter,when devm_add_action_or_reset return
> failed.
>
> Signed-off-by: Tian Tao <tiantao6 at hisilicon.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
> ---
> drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c
> index 70ab4fb..c8f44bc 100644
> --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c
> +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c
> @@ -265,11 +265,9 @@ static int dw_hdmi_cec_probe(struct platform_device *pdev)
> /* override the module pointer */
> cec->adap->owner = THIS_MODULE;
>
> - ret = devm_add_action(&pdev->dev, dw_hdmi_cec_del, cec);
> - if (ret) {
> - cec_delete_adapter(cec->adap);
> + ret = devm_add_action_or_reset(&pdev->dev, dw_hdmi_cec_del, cec);
> + if (ret)
> return ret;
> - }
>
> ret = devm_request_threaded_irq(&pdev->dev, cec->irq,
> dw_hdmi_cec_hardirq,
--
Regards,
Laurent Pinchart
More information about the dri-devel
mailing list