Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20200911112151.3220469-1-yukuai3@huawei.com>
In-Reply-To: <20200911112151.3220469-1-yukuai3@huawei.com>
From:   Chun-Kuang Hu <chunkuang.hu@kernel.org>
Date:   Tue, 15 Sep 2020 07:44:03 +0800
Message-ID: <CAAOTY__jzUgrz9UuRFn104ePfMY5sR4vLuRRFNWVO=1naZUntw@mail.gmail.com>
Subject: Re: [PATCH] drm/mediatek: add missing put_device() call in mtk_hdmi_dt_parse_pdata()
To:     Yu Kuai <yukuai3@huawei.com>
Cc:     Chun-Kuang Hu <chunkuang.hu@kernel.org>,
        Philipp Zabel <p.zabel@pengutronix.de>,
        David Airlie <airlied@linux.ie>,
        Daniel Vetter <daniel@ffwll.ch>,
        Matthias Brugger <matthias.bgg@gmail.com>,
        jie.qiu@mediatek.com, junzhi.zhao@mediatek.com,
        DRI Development <dri-devel@lists.freedesktop.org>,
        Linux ARM <linux-arm-kernel@lists.infradead.org>,
        "moderated list:ARM/Mediatek SoC support" 
        <linux-mediatek@lists.infradead.org>,
        linux-kernel <linux-kernel@vger.kernel.org>, yi.zhang@huawei.com
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Hi, Yu Kuai:

Yu Kuai <yukuai3@huawei.com> =E6=96=BC 2020=E5=B9=B49=E6=9C=8811=E6=97=A5 =
=E9=80=B1=E4=BA=94 =E4=B8=8B=E5=8D=887:22=E5=AF=AB=E9=81=93=EF=BC=9A
>
> 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@kernel.org>

>
> Fixes: 8f83f26891e1 ("drm/mediatek: Add HDMI support")
> Signed-off-by: Yu Kuai <yukuai3@huawei.com>
> ---
>  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/mediat=
ek/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_hdm=
i *hdmi,
>                 dev_err(dev,
>                         "Failed to get system configuration registers: %d=
\n",
>                         ret);
> -               return ret;
> +               goto put_device;
>         }
>         hdmi->sys_regmap =3D regmap;
>
>         mem =3D platform_get_resource(pdev, IORESOURCE_MEM, 0);
>         hdmi->regs =3D devm_ioremap_resource(dev, mem);
> -       if (IS_ERR(hdmi->regs))
> -               return PTR_ERR(hdmi->regs);
> +       if (IS_ERR(hdmi->regs)) {
> +               ret =3D PTR_ERR(hdmi->regs);
> +               goto put_device;
> +       }
>
>         remote =3D of_graph_get_remote_node(np, 1, 0);
> -       if (!remote)
> -               return -EINVAL;
> +       if (!remote) {
> +               ret =3D -EINVAL;
> +               goto put_device;
> +       }
>
>         if (!of_device_is_compatible(remote, "hdmi-connector")) {
>                 hdmi->next_bridge =3D 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 =3D -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 =3D -EINVAL;
> +               goto put_device;
>         }
>         of_node_put(remote);
>
> @@ -1542,10 +1548,14 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdm=
i *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 =3D -EINVAL;
> +               goto put_device;
>         }
>
>         return 0;
> +put_device:
> +       put_device(hdmi->cec_dev);
> +       return ret;
>  }
>
>  /*
> --
> 2.25.4
>