aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2016-06-19 22:43:43 -0400
committerXinliang Liu <xinliang.liu@linaro.org>2016-07-04 06:49:20 -0400
commit43fd0d92300878c81ef97e8bb91074025c4acf0f (patch)
tree17addde7ac62b04504697fa34ed98dc50a14a491
parentdac2c48ca5ac9bb2d6339aaa733c60d5b801ee86 (diff)
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: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Reviewed-by: Chen Feng <puck.chen@hisilicon.com>
-rw-r--r--drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
index ed76baad525f..16834f4b9156 100644
--- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
+++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
@@ -965,21 +965,21 @@ static int ade_dts_parse(struct platform_device *pdev, struct ade_hw_ctx *ctx)
965 } 965 }
966 966
967 ctx->ade_core_clk = devm_clk_get(dev, "clk_ade_core"); 967 ctx->ade_core_clk = devm_clk_get(dev, "clk_ade_core");
968 if (!ctx->ade_core_clk) { 968 if (IS_ERR(ctx->ade_core_clk)) {
969 DRM_ERROR("failed to parse clk ADE_CORE\n"); 969 DRM_ERROR("failed to parse clk ADE_CORE\n");
970 return -ENODEV; 970 return PTR_ERR(ctx->ade_core_clk);
971 } 971 }
972 972
973 ctx->media_noc_clk = devm_clk_get(dev, "clk_codec_jpeg"); 973 ctx->media_noc_clk = devm_clk_get(dev, "clk_codec_jpeg");
974 if (!ctx->media_noc_clk) { 974 if (IS_ERR(ctx->media_noc_clk)) {
975 DRM_ERROR("failed to parse clk CODEC_JPEG\n"); 975 DRM_ERROR("failed to parse clk CODEC_JPEG\n");
976 return -ENODEV; 976 return PTR_ERR(ctx->media_noc_clk);
977 } 977 }
978 978
979 ctx->ade_pix_clk = devm_clk_get(dev, "clk_ade_pix"); 979 ctx->ade_pix_clk = devm_clk_get(dev, "clk_ade_pix");
980 if (!ctx->ade_pix_clk) { 980 if (IS_ERR(ctx->ade_pix_clk)) {
981 DRM_ERROR("failed to parse clk ADE_PIX\n"); 981 DRM_ERROR("failed to parse clk ADE_PIX\n");
982 return -ENODEV; 982 return PTR_ERR(ctx->ade_pix_clk);
983 } 983 }
984 984
985 return 0; 985 return 0;