From patchwork Tue Jul 12 11:02:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: weiyj_lk@163.com X-Patchwork-Id: 9225055 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0090260572 for ; Tue, 12 Jul 2016 11:03:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E58EE27CCB for ; Tue, 12 Jul 2016 11:03:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D9CE927F7A; Tue, 12 Jul 2016 11:03:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8BE4427CCB for ; Tue, 12 Jul 2016 11:03:04 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bMvSx-0005GK-Kg; Tue, 12 Jul 2016 11:03:03 +0000 Received: from m12-16.163.com ([220.181.12.16]) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bMvSn-000541-6s; Tue, 12 Jul 2016 11:02:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=eGsrf A1M2KleJ4/BGogg0dUNZI3YGsa2aHUyHXWtItI=; b=VRedU4/zZyadG/4WLMdrg xyqNIBuRay4Sk+tljJ8G2v7EJV9uzRCRogOGTIBbGySdGiMZDUP4aKvSB+U320lf 5kko7+dNWSqoVDTVninXD4fyvx2oQcFEjbmUEMRgt/m1NMLeCBEiprwd8ddYQknC TU+pVEpODLwdkvJnCt5IJ4= Received: from localhost.localdomain.localdomain (unknown [180.110.253.144]) by smtp12 (Coremail) with SMTP id EMCowADnTqREzoRXBfZOBQ--.19672S2; Tue, 12 Jul 2016 19:02:29 +0800 (CST) From: weiyj_lk@163.com To: Mauro Carvalho Chehab , Matthias Brugger , Hans Verkuil , Tiffany Lin Subject: [PATCH -next] [media] vcodec: mediatek: Fix return value check in mtk_vcodec_init_enc_pm() Date: Tue, 12 Jul 2016 11:02:28 +0000 Message-Id: <1468321348-16045-1-git-send-email-weiyj_lk@163.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-CM-TRANSID: EMCowADnTqREzoRXBfZOBQ--.19672S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxJF17JryUZr43Kw47GFWDCFg_yoW8AFWUpF 1kJF9Iy348tw4Iyry3Aw47X3WkCw48tFW8GwnIvw1rZr9xt3yfWr40qF18WFZ8trZrZF4r ZrsIv393GF4Y9FUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jksqZUUUUU= X-Originating-IP: [180.110.253.144] X-CM-SenderInfo: pzhl5yxbonqiywtou0bp/1tbiNQWk1lSIOudF4wAAsl X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160712_040253_652278_A6664425 X-CRM114-Status: UNSURE ( 8.21 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Wei Yongjun , linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+patchwork-linux-mediatek=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Wei Yongjun 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 Reviewed-by:Tiffany Lin --- 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;