Re: [PATCH] drm/mediatek: add missing put_device() call in mtk_hdmi_dt_parse_pdata()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi, Yu Kuai:

Yu Kuai <yukuai3@xxxxxxxxxx> 於 2020年9月11日 週五 下午7:22寫道:
>
> if of_find_device_by_node() succeed, mtk_drm_kms_init() doesn't have
> a corresponding put_device(). Thus add jump target to fix the exception
> handling for this function implementation.

Reviewed-by: Chun-Kuang Hu <chunkuang.hu@xxxxxxxxxx>

>
> Fixes: 8f83f26891e1 ("drm/mediatek: Add HDMI support")
> Signed-off-by: Yu Kuai <yukuai3@xxxxxxxxxx>
> ---
>  drivers/gpu/drm/mediatek/mtk_hdmi.c | 26 ++++++++++++++++++--------
>  1 file changed, 18 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c
> index f2e9b429960b..a97725680d4e 100644
> --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
> +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
> @@ -1507,25 +1507,30 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,
>                 dev_err(dev,
>                         "Failed to get system configuration registers: %d\n",
>                         ret);
> -               return ret;
> +               goto put_device;
>         }
>         hdmi->sys_regmap = regmap;
>
>         mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>         hdmi->regs = devm_ioremap_resource(dev, mem);
> -       if (IS_ERR(hdmi->regs))
> -               return PTR_ERR(hdmi->regs);
> +       if (IS_ERR(hdmi->regs)) {
> +               ret = PTR_ERR(hdmi->regs);
> +               goto put_device;
> +       }
>
>         remote = of_graph_get_remote_node(np, 1, 0);
> -       if (!remote)
> -               return -EINVAL;
> +       if (!remote) {
> +               ret = -EINVAL;
> +               goto put_device;
> +       }
>
>         if (!of_device_is_compatible(remote, "hdmi-connector")) {
>                 hdmi->next_bridge = of_drm_find_bridge(remote);
>                 if (!hdmi->next_bridge) {
>                         dev_err(dev, "Waiting for external bridge\n");
>                         of_node_put(remote);
> -                       return -EPROBE_DEFER;
> +                       ret = -EPROBE_DEFER;
> +                       goto put_device;
>                 }
>         }
>
> @@ -1534,7 +1539,8 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,
>                 dev_err(dev, "Failed to find ddc-i2c-bus node in %pOF\n",
>                         remote);
>                 of_node_put(remote);
> -               return -EINVAL;
> +               ret = -EINVAL;
> +               goto put_device;
>         }
>         of_node_put(remote);
>
> @@ -1542,10 +1548,14 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,
>         of_node_put(i2c_np);
>         if (!hdmi->ddc_adpt) {
>                 dev_err(dev, "Failed to get ddc i2c adapter by node\n");
> -               return -EINVAL;
> +               ret = -EINVAL;
> +               goto put_device;
>         }
>
>         return 0;
> +put_device:
> +       put_device(hdmi->cec_dev);
> +       return ret;
>  }
>
>  /*
> --
> 2.25.4
>
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel




[Index of Archives]     [Linux DRI Users]     [Linux Intel Graphics]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [XFree86]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [XFree86]
  Powered by Linux