1 files changed, 13 insertions, 0 deletions

diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index da77930480e9..ef91fc0390b4 100644
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -664,6 +664,12 @@ void __init omap_serial_early_init(void)
                 struct device *dev = &pdev->dev;
                 struct plat_serial8250_port *p = dev->platform_data;
 
+                /* Don't map zero-based physical address */
+                if (p->mapbase == 0) {
+                        printk(KERN_WARNING "omap serial: No physical address"
+                               " for uart#%d, so skipping early_init...\n", i);
+                        continue;
+                }
                 /*
                  * Module 4KB + L4 interconnect 4KB
                  * Static mapping, never released
@@ -727,6 +733,13 @@ void __init omap_serial_init_port(int port)
         pdev = &uart->pdev;
         dev = &pdev->dev;
 
+        /* Don't proceed if there's no clocks available */
+        if (unlikely(!uart->ick || !uart->fck)) {
+                WARN(1, "%s: can't init uart%d, no clocks available\n",
+                     kobject_name(&dev->kobj), port);
+                return;
+        }
+
         omap_uart_enable_clocks(uart);
 
         omap_uart_reset(uart);