From 2efeec2d035ca4901ca5d53262c814935b730f44 Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Tue, 12 Jul 2016 08:02:28 -0300 Subject: [PATCH] [media] vcodec: mediatek: Fix return value check in mtk_vcodec_init_enc_pm() In case of error, the function devm_clk_get() returns ERR_PTR() and not returns NULL. The NULL test in the return value check should be replaced with IS_ERR(). Signed-off-by: Wei Yongjun Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- .../platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c index 2379e9766c4d..3e73e9db781f 100644 --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c @@ -67,27 +67,27 @@ int mtk_vcodec_init_enc_pm(struct mtk_vcodec_dev *mtkdev) pm->dev = &pdev->dev; pm->vencpll_d2 = devm_clk_get(&pdev->dev, "venc_sel_src"); - if (pm->vencpll_d2 == NULL) { + if (IS_ERR(pm->vencpll_d2)) { mtk_v4l2_err("devm_clk_get vencpll_d2 fail"); - ret = -1; + ret = PTR_ERR(pm->vencpll_d2); } pm->venc_sel = devm_clk_get(&pdev->dev, "venc_sel"); - if (pm->venc_sel == NULL) { + if (IS_ERR(pm->venc_sel)) { mtk_v4l2_err("devm_clk_get venc_sel fail"); - ret = -1; + ret = PTR_ERR(pm->venc_sel); } pm->univpll1_d2 = devm_clk_get(&pdev->dev, "venc_lt_sel_src"); - if (pm->univpll1_d2 == NULL) { + if (IS_ERR(pm->univpll1_d2)) { mtk_v4l2_err("devm_clk_get univpll1_d2 fail"); - ret = -1; + ret = PTR_ERR(pm->univpll1_d2); } pm->venc_lt_sel = devm_clk_get(&pdev->dev, "venc_lt_sel"); - if (pm->venc_lt_sel == NULL) { + if (IS_ERR(pm->venc_lt_sel)) { mtk_v4l2_err("devm_clk_get venc_lt_sel fail"); - ret = -1; + ret = PTR_ERR(pm->venc_lt_sel); } return ret;