git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'omap4-i2c-init' into omap-for-linus
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
irq.c
diff --git
a/arch/arm/mach-omap2/irq.c
b/arch/arm/mach-omap2/irq.c
index
2705402
..
26aeef5
100644
(file)
--- a/
arch/arm/mach-omap2/irq.c
+++ b/
arch/arm/mach-omap2/irq.c
@@
-194,7
+194,7
@@
void __init omap_init_irq(void)
int i;
for (i = 0; i < ARRAY_SIZE(irq_banks); i++) {
int i;
for (i = 0; i < ARRAY_SIZE(irq_banks); i++) {
- unsigned long base;
+ unsigned long base
= 0
;
struct omap_irq_bank *bank = irq_banks + i;
if (cpu_is_omap24xx())
struct omap_irq_bank *bank = irq_banks + i;
if (cpu_is_omap24xx())
@@
-202,6
+202,8
@@
void __init omap_init_irq(void)
else if (cpu_is_omap34xx())
base = OMAP34XX_IC_BASE;
else if (cpu_is_omap34xx())
base = OMAP34XX_IC_BASE;
+ BUG_ON(!base);
+
/* Static mapping, never released */
bank->base_reg = ioremap(base, SZ_4K);
if (!bank->base_reg) {
/* Static mapping, never released */
bank->base_reg = ioremap(base, SZ_4K);
if (!bank->base_reg) {