From patchwork Mon Mar 11 13:57:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 2248911 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 0BFF43FC8F for ; Mon, 11 Mar 2013 13:57:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751181Ab3CKN5Y (ORCPT ); Mon, 11 Mar 2013 09:57:24 -0400 Received: from mail-bk0-f48.google.com ([209.85.214.48]:55900 "EHLO mail-bk0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751033Ab3CKN5X (ORCPT ); Mon, 11 Mar 2013 09:57:23 -0400 Received: by mail-bk0-f48.google.com with SMTP id jf20so1673676bkc.7 for ; Mon, 11 Mar 2013 06:57:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:date:message-id:subject:from:to:cc :content-type; bh=ytXPGpJ3UREnbeGsYTkkk5fmFWoExOR8RfkNVEO9+dk=; b=qQJxo4tk7jtIyPaXHwQlDCdb981P7x6P7e/JX94EbA76j5aSYJ2jha+mk3b8Uh1wN3 NDdKxy4A0XULGHMfnU8Zaggcyyl4KUKJ9MMpsA/cB5B3WVWvxCzv3bglx+TmmbRUc5x1 +x9xlbtKEt7jfpzM+o/JAytaNyzK4nIHcU899GNcpyK6kZehYRrHPfRi/GwheJsbAEfR XtnTpPLUgfzxm17jqV1/6DzBz5l1301A3aHiRC8TMnA2kWGwtTVUFpBPccD53q0TEIT6 V3lFLU/BL1kUHUQrodehpLU0Ehi+hGS1XdcxMvV9PEBP1sgnArtCzORONb+CkINPFCFR CNbg== MIME-Version: 1.0 X-Received: by 10.204.238.133 with SMTP id ks5mr4693278bkb.101.1363010242138; Mon, 11 Mar 2013 06:57:22 -0700 (PDT) Received: by 10.204.30.210 with HTTP; Mon, 11 Mar 2013 06:57:22 -0700 (PDT) Date: Mon, 11 Mar 2013 21:57:22 +0800 Message-ID: Subject: [PATCH -next] [media] davinci: vpfe: fix return value check in vpfe_enable_clock() From: Wei Yongjun To: mchehab@redhat.com, gregkh@linuxfoundation.org, prabhakar.lad@ti.com, sakari.ailus@iki.fi, laurent.pinchart@ideasonboard.com, hans.verkuil@cisco.com Cc: yongjun_wei@trendmicro.com.cn, linux-media@vger.kernel.org, devel@driverdev.osuosl.org Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Wei Yongjun In case of error, the function clk_get() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR(). Signed-off-by: Wei Yongjun Acked-by: Lad, Prabhakar Reviewed-by: Sakari Ailus --- drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c b/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c index 7b35171..6a8222c 100644 --- a/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c +++ b/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c @@ -243,7 +243,7 @@ static int vpfe_enable_clock(struct vpfe_device *vpfe_dev) vpfe_dev->clks[i] = clk_get(vpfe_dev->pdev, vpfe_cfg->clocks[i]); - if (vpfe_dev->clks[i] == NULL) { + if (IS_ERR(vpfe_dev->clks[i])) { v4l2_err(vpfe_dev->pdev->driver, "Failed to get clock %s\n", vpfe_cfg->clocks[i]); @@ -264,7 +264,7 @@ static int vpfe_enable_clock(struct vpfe_device *vpfe_dev) return 0; out: for (i = 0; i < vpfe_cfg->num_clocks; i++) - if (vpfe_dev->clks[i]) { + if (!IS_ERR(vpfe_dev->clks[i])) { clk_disable_unprepare(vpfe_dev->clks[i]); clk_put(vpfe_dev->clks[i]); }