From d43339d6aab7679448ea9f52ea472d6551a60e6d Mon Sep 17 00:00:00 2001
From: Kevin Hilman <khilman@deeprootsystems.com>
Date: Fri, 29 Jan 2010 14:20:06 -0800
Subject: [PATCH] --- yaml --- r: 180247 b: refs/heads/master c:
 8d08436d782d177747a0fac1e1455a44b932b7c6 h: refs/heads/master i:   180245:
 94a9cf5b99c3c74514ffa57072d6fd16d6e74b51   180243:
 449c69a9e3dec7f449eb2fddba309a71b31937ff   180239:
 294e04ab1138e216423a9d8d6bd66d76f06dad5b v: v3

---
 [refs]                           | 2 +-
 trunk/arch/arm/mach-omap2/gpmc.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 980ec1ffcd52..a58a0a8c0e4d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74005a2b116203f618fe784d88ad7e6071bb1554
+refs/heads/master: 8d08436d782d177747a0fac1e1455a44b932b7c6
diff --git a/trunk/arch/arm/mach-omap2/gpmc.c b/trunk/arch/arm/mach-omap2/gpmc.c
index 3f1334f62e7a..7027cdc1ba49 100644
--- a/trunk/arch/arm/mach-omap2/gpmc.c
+++ b/trunk/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);