* [PATCH -next] [media] vcodec: mediatek: Fix return value check in mtk_vcodec_init_enc_pm()
@ 2016-07-12 11:02 weiyj_lk at 163.com
2016-07-12 11:21 ` tiffany lin
0 siblings, 1 reply; 2+ messages in thread
From: weiyj_lk at 163.com @ 2016-07-12 11:02 UTC (permalink / raw)
To: linux-arm-kernel
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
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>
---
drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c
index 2379e97..3e73e9d 100644
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c
@@ -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;
^ permalink raw reply related [flat|nested] 2+ messages in thread* [PATCH -next] [media] vcodec: mediatek: Fix return value check in mtk_vcodec_init_enc_pm()
2016-07-12 11:02 [PATCH -next] [media] vcodec: mediatek: Fix return value check in mtk_vcodec_init_enc_pm() weiyj_lk at 163.com
@ 2016-07-12 11:21 ` tiffany lin
0 siblings, 0 replies; 2+ messages in thread
From: tiffany lin @ 2016-07-12 11:21 UTC (permalink / raw)
To: linux-arm-kernel
Reviewed-by:Tiffany Lin <tiffany.lin@mediatek.com>
On Tue, 2016-07-12 at 11:02 +0000, weiyj_lk at 163.com wrote:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> 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>
> ---
> drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c
> index 2379e97..3e73e9d 100644
> --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c
> +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c
> @@ -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;
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-07-12 11:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-12 11:02 [PATCH -next] [media] vcodec: mediatek: Fix return value check in mtk_vcodec_init_enc_pm() weiyj_lk at 163.com
2016-07-12 11:21 ` tiffany lin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).