diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-02-05 12:16:39 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-02-05 12:16:39 +0900 |
| commit | 8e04221029067cbaff3fc8f4daf991532afbcbaf (patch) | |
| tree | 18cf757bcd315c76f5f458aa72a0a57db0a78985 /arch/arm/mach-omap2/gpmc.c | |
| parent | 9ad62ec4f752c82b39aa5927f23d894b46ae10b9 (diff) | |
| parent | 2c940db250c1610d95ea5331dc819b8bd4db96ae (diff) | |
| download | linux-8e04221029067cbaff3fc8f4daf991532afbcbaf.tar.gz linux-8e04221029067cbaff3fc8f4daf991532afbcbaf.tar.xz | |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'arch/arm/mach-omap2/gpmc.c')
| -rw-r--r-- | arch/arm/mach-omap2/gpmc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index 3f1334f62e7a..7027cdc1ba49 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); |