From patchwork Mon Mar 11 15:55:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 2249311 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 2971ADF5B1 for ; Mon, 11 Mar 2013 15:58:49 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UF54R-0004p7-Fw; Mon, 11 Mar 2013 15:55:28 +0000 Received: from mail-bk0-x234.google.com ([2a00:1450:4008:c01::234]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UF54K-0004ly-Lg for linux-arm-kernel@lists.infradead.org; Mon, 11 Mar 2013 15:55:23 +0000 Received: by mail-bk0-f52.google.com with SMTP id jk13so1765003bkc.11 for ; Mon, 11 Mar 2013 08:55:18 -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=DL6ljTZigYwj+VxrcgarQV/IjVPgno4NmbeHZaZGWuw=; b=yGdn/d/Dih7div2AGpyaUfggw0nHiunNXWIdUh8EbdxwcSHgObYFvO0071t4fid9I1 FQdjOCx/CatElB/cp7PXb4XHDUznYN7EgtD4M5BrQ1DmwGpC6aMnH/zpTJKGPVxUaELZ lz5doNKMmpVek9YP0bWjnI7pHykAO29+ZucopwAyEan64w88RJqTzkO2lOrbsaO1945o Z6WkjCTB9ZhNC8kwthbRakoVBpMtsvRJp/T8zJ3TuIkswdTZ6qb5Qv/s8JFhWv2nxVRW viyiH/plicYPdG6RBpN0SQDfADNe7yXedxXDY1T4oF/wMGSTBCfHOC2RKAUNCIoNZk9k lotg== MIME-Version: 1.0 X-Received: by 10.205.133.1 with SMTP id hw1mr4850541bkc.58.1363017318557; Mon, 11 Mar 2013 08:55:18 -0700 (PDT) Received: by 10.204.30.210 with HTTP; Mon, 11 Mar 2013 08:55:18 -0700 (PDT) Date: Mon, 11 Mar 2013 23:55:18 +0800 Message-ID: Subject: [PATCH] clk: prima2: fix return value check in sirfsoc_of_clk_init() From: Wei Yongjun To: mturquette@linaro.org, Baohua.Song@csr.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130311_115520_886177_7FD4728E X-CRM114-Status: GOOD ( 10.37 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (weiyj.lk[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: yongjun_wei@trendmicro.com.cn, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Wei Yongjun In case of error, the function clk_get() returns ERR_PTR() not NULL. The NULL test in the return value check should be replaced with IS_ERR(). Signed-off-by: Wei Yongjun --- drivers/clk/clk-prima2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/clk-prima2.c b/drivers/clk/clk-prima2.c index f8e9d0c..b208665 100644 --- a/drivers/clk/clk-prima2.c +++ b/drivers/clk/clk-prima2.c @@ -1113,7 +1113,7 @@ void __init sirfsoc_of_clk_init(void) for (i = pll1; i < maxclk; i++) { prima2_clks[i] = clk_register(NULL, prima2_clk_hw_array[i]); - BUG_ON(!prima2_clks[i]); + BUG_ON(IS_ERR(prima2_clks[i]); } clk_register_clkdev(prima2_clks[cpu], NULL, "cpu"); clk_register_clkdev(prima2_clks[io], NULL, "io");