| Message ID | 20200506154832.v2.3.Ia8efd7905e2fcfc81f547e27a51f06373624b3da@changeid (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | MTK MDP driver cleanups to prep for futher work | expand |
Hi Eizan, Thank you for your patch. Missatge de Eizan Miyamoto <eizan@chromium.org> del dia dc., 6 de maig 2020 a les 7:51: > > This is a cleanup to better handle errors during MDP probe. > > Signed-off-by: eizan@chromium.org ditto, remove the above line. > Signed-off-by: Eizan Miyamoto <eizan@chromium.org> > --- Other than that: Reviewed-by: Enric Balletbo i Serra <enric.balletbo@collabora.com> > > Changes in v1: > - remove unnecessary error handling labels in favor of err_m2m_register > > drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c > index 9b24b8d46eb7..17d155219ba2 100644 > --- a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c > +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c > @@ -188,8 +188,12 @@ static int mtk_mdp_probe(struct platform_device *pdev) > } > > mdp->vpu_dev = vpu_get_plat_device(pdev); > - vpu_wdt_reg_handler(mdp->vpu_dev, mtk_mdp_reset_handler, mdp, > - VPU_RST_MDP); > + ret = vpu_wdt_reg_handler(mdp->vpu_dev, mtk_mdp_reset_handler, mdp, > + VPU_RST_MDP); > + if (ret) { > + dev_err(&pdev->dev, "Failed to register reset handler\n"); > + goto err_m2m_register; > + } > > platform_set_drvdata(pdev, mdp); > > -- > 2.26.2.526.g744177e7f7-goog > > > _______________________________________________ > Linux-mediatek mailing list > Linux-mediatek@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-mediatek
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c index 9b24b8d46eb7..17d155219ba2 100644 --- a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c @@ -188,8 +188,12 @@ static int mtk_mdp_probe(struct platform_device *pdev) } mdp->vpu_dev = vpu_get_plat_device(pdev); - vpu_wdt_reg_handler(mdp->vpu_dev, mtk_mdp_reset_handler, mdp, - VPU_RST_MDP); + ret = vpu_wdt_reg_handler(mdp->vpu_dev, mtk_mdp_reset_handler, mdp, + VPU_RST_MDP); + if (ret) { + dev_err(&pdev->dev, "Failed to register reset handler\n"); + goto err_m2m_register; + } platform_set_drvdata(pdev, mdp);