summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2016-07-12 13:00:55 +0200
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2016-07-13 12:59:52 +0200
commitffe57033008ba7b09f1319ea0f7fb8d91624046a (patch)
tree6894c4f006be74960413382f6ec6355207560da1
parent[media] cec: split the timestamp into an rx and tx timestamp (diff)
downloadlinux-ffe57033008ba7b09f1319ea0f7fb8d91624046a.tar.xz
linux-ffe57033008ba7b09f1319ea0f7fb8d91624046a.zip
[media] VPU: mediatek: fix return value check in mtk_vpu_probe()
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>
-rw-r--r--drivers/media/platform/mtk-vpu/mtk_vpu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/mtk-vpu/mtk_vpu.c b/drivers/media/platform/mtk-vpu/mtk_vpu.c
index b60d02c0f653..c8b2c72e7c48 100644
--- a/drivers/media/platform/mtk-vpu/mtk_vpu.c
+++ b/drivers/media/platform/mtk-vpu/mtk_vpu.c
@@ -788,9 +788,9 @@ static int mtk_vpu_probe(struct platform_device *pdev)
/* Get VPU clock */
vpu->clk = devm_clk_get(dev, "main");
- if (!vpu->clk) {
+ if (IS_ERR(vpu->clk)) {
dev_err(dev, "get vpu clock failed\n");
- return -EINVAL;
+ return PTR_ERR(vpu->clk);
}
platform_set_drvdata(pdev, vpu);