From patchwork Wed Feb 3 02:26:09 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 76573 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o132Pec2027184 for ; Wed, 3 Feb 2010 02:25:42 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932368Ab0BCCZm (ORCPT ); Tue, 2 Feb 2010 21:25:42 -0500 Received: from mho-02-ewr.mailhop.org ([204.13.248.72]:59361 "EHLO mho-02-ewr.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932331Ab0BCCZl (ORCPT ); Tue, 2 Feb 2010 21:25:41 -0500 Received: from c-67-160-239-110.hsd1.ca.comcast.net ([67.160.239.110] helo=baageli.muru.com) by mho-02-ewr.mailhop.org with esmtpa (Exim 4.68) (envelope-from ) id 1NcUw0-0003xh-QQ; Wed, 03 Feb 2010 02:25:40 +0000 X-Mail-Handler: MailHop Outbound by DynDNS X-Originating-IP: 67.160.239.110 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/mailhop/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX1/9fjKfJWuVJGKZMrmaYWO3 Subject: [PATCH 5/9] OMAP2/3: GPMC: ensure valid clock pointer To: linux-arm-kernel@lists.infradead.org From: Tony Lindgren Cc: Kevin Hilman , linux-omap@vger.kernel.org Date: Tue, 02 Feb 2010 18:26:09 -0800 Message-ID: <20100203022609.26347.33153.stgit@baageli.muru.com> In-Reply-To: <20100203022318.26347.34734.stgit@baageli.muru.com> References: <20100203022318.26347.34734.stgit@baageli.muru.com> User-Agent: StGit/0.15 MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 03 Feb 2010 02:25:42 +0000 (UTC) diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index 3f1334f..7027cdc 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c @@ -505,7 +505,7 @@ static void __init gpmc_mem_init(void) void __init gpmc_init(void) { u32 l; - char *ck; + char *ck = NULL; if (cpu_is_omap24xx()) { ck = "core_l3_ck"; @@ -521,6 +521,9 @@ void __init gpmc_init(void) l = OMAP44XX_GPMC_BASE; } + if (WARN_ON(!ck)) + return; + gpmc_l3_clk = clk_get(NULL, ck); if (IS_ERR(gpmc_l3_clk)) { printk(KERN_ERR "Could not get GPMC clock %s\n", ck);