[media] vcodec: mediatek: Fix return value check in mtk_vcodec_init_enc_pm()
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>
Tue, 12 Jul 2016 11:02:28 +0000 (08:02 -0300)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Wed, 13 Jul 2016 11:00:57 +0000 (08:00 -0300)
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 <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c

index 2379e9766c4d66561fca437ea234f871ff96a068..3e73e9db781f426f5682cda940c8ab0499803319 100644 (file)
@@ -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;