[PATCH v2 3/5] [media] mtk-mdp: handle vpu_wdt_reg_handler() errors during probe

From: Eizan Miyamoto
Date: Wed May 06 2020 - 01:50:36 EST


This is a cleanup to better handle errors during MDP probe.

Signed-off-by: eizan@xxxxxxxxxxxx
Signed-off-by: Eizan Miyamoto <eizan@xxxxxxxxxxxx>
---

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