drm/hisilicon: Fix return value check in ade_dts_parse()
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>
Mon, 20 Jun 2016 02:43:43 +0000 (10:43 +0800)
committerXinliang Liu <xinliang.liu@linaro.org>
Mon, 4 Jul 2016 10:49:20 +0000 (18:49 +0800)
In case of error, the function devm_clk_get() returns ERR_PTR()
and never 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>
Reviewed-by: Chen Feng <puck.chen@hisilicon.com>
drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c

index ed76baad525fa5de193c97698341fa01e748c6ec..16834f4b91564a11ad78c7ad706b21434baae0d5 100644 (file)
@@ -965,21 +965,21 @@ static int ade_dts_parse(struct platform_device *pdev, struct ade_hw_ctx *ctx)
        }
 
        ctx->ade_core_clk = devm_clk_get(dev, "clk_ade_core");
-       if (!ctx->ade_core_clk) {
+       if (IS_ERR(ctx->ade_core_clk)) {
                DRM_ERROR("failed to parse clk ADE_CORE\n");
-               return -ENODEV;
+               return PTR_ERR(ctx->ade_core_clk);
        }
 
        ctx->media_noc_clk = devm_clk_get(dev, "clk_codec_jpeg");
-       if (!ctx->media_noc_clk) {
+       if (IS_ERR(ctx->media_noc_clk)) {
                DRM_ERROR("failed to parse clk CODEC_JPEG\n");
-           return -ENODEV;
+               return PTR_ERR(ctx->media_noc_clk);
        }
 
        ctx->ade_pix_clk = devm_clk_get(dev, "clk_ade_pix");
-       if (!ctx->ade_pix_clk) {
+       if (IS_ERR(ctx->ade_pix_clk)) {
                DRM_ERROR("failed to parse clk ADE_PIX\n");
-           return -ENODEV;
+               return PTR_ERR(ctx->ade_pix_clk);
        }
 
        return 0;
This page took 0.027096 seconds and 5 git commands to generate.