redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

[media] vcodec: mediatek: Fix return value check in mtk_vcodec_init_enc_pm() 

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>
hifive-unleashed-5.1
Wei Yongjun 2016-07-12 08:02:28 -03:00 committed by Mauro Carvalho Chehab
parent 14ee452f3a
commit 2efeec2d03
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c
View 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;