Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43fd0d92 authored by Wei Yongjun's avatar Wei Yongjun Committed by Xinliang Liu
Browse files

drm/hisilicon: Fix return value check in ade_dts_parse() 



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: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Reviewed-by: default avatarChen Feng <puck.chen@hisilicon.com>
parent dac2c48c

drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -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");

	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");

		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");

	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");

		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");

	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");

		DRM_ERROR("failed to parse clk ADE_PIX\n");

	    return -ENODEV;

		return PTR_ERR(ctx->ade_pix_clk);

	}

	}





	return 0;

	return 0;