| Message ID | 20200505125042.v1.3.Ieebc5dcb6dcc116119a570f14786ba47c9007ec8@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 dt., 5 de maig 2020 a les 6:01: > > This is a cleanup to better handle errors during MDP probe. > > Signed-off-by: eizan@chromium.org > Signed-off-by: Eizan Miyamoto <eizan@google.com> Ditto > --- > > drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 10 ++++++++-- > 1 file changed, 8 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 c20ac7681c6f..f974242663dc 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_wdt_reg; No need to introduce a new label, just goto err_m2m_register > + } > > platform_set_drvdata(pdev, mdp); > > @@ -206,6 +210,8 @@ static int mtk_mdp_probe(struct platform_device *pdev) > > err_set_max_seg_size: > > +err_wdt_reg: > + > err_m2m_register: > v4l2_device_unregister(&mdp->v4l2_dev); > > -- > 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 c20ac7681c6f..f974242663dc 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_wdt_reg; + } platform_set_drvdata(pdev, mdp); @@ -206,6 +210,8 @@ static int mtk_mdp_probe(struct platform_device *pdev) err_set_max_seg_size: +err_wdt_reg: + err_m2m_register: v4l2_device_unregister(&mdp->v4l2_dev);