From: tiffany.lin@mediatek.com (tiffany lin)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH -next] [media] vcodec: mediatek: Fix return value check in mtk_vcodec_init_enc_pm()
Date: Tue, 12 Jul 2016 19:21:42 +0800 [thread overview]
Message-ID: <1468322502.2462.8.camel@mtksdaap41> (raw)
In-Reply-To: <1468321348-16045-1-git-send-email-weiyj_lk@163.com>
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;
>
>
prev parent reply other threads:[~2016-07-12 11:21 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1468322502.2462.8.camel@mtksdaap41 \
--to=tiffany.lin@mediatek.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).