From 6942b41ba92a741d5dd794fe8941267a30c15d89 Mon Sep 17 00:00:00 2001
From: Mika Westerberg <ext-mika.1.westerberg@nokia.com>
Date: Mon, 14 Dec 2009 13:59:18 +0000
Subject: [PATCH] --- yaml --- r: 177977 b: refs/heads/master c:
 f2eeeae06a41d4f9c90f8382cc0ef1d35888d09a h: refs/heads/master i:   177975:
 9cd6347b0f5693cffe7f1d1f0ef16cb75e463b05 v: v3

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

diff --git a/[refs] b/[refs]
index 892558e39b8a..83449a15552c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ebeb53e1e1f11a51d8a93843a437f516e3528bfa
+refs/heads/master: f2eeeae06a41d4f9c90f8382cc0ef1d35888d09a
diff --git a/trunk/arch/arm/mach-omap2/serial.c b/trunk/arch/arm/mach-omap2/serial.c
index 39b797bc14d6..19805a7de06c 100644
--- a/trunk/arch/arm/mach-omap2/serial.c
+++ b/trunk/arch/arm/mach-omap2/serial.c
@@ -640,12 +640,9 @@ void __init omap_serial_early_init(void)
 		uart->num = i;
 		p->private_data = uart;
 		uart->p = p;
-		list_add_tail(&uart->node, &uart_list);
 
 		if (cpu_is_omap44xx())
 			p->irq += 32;
-
-		omap_uart_enable_clocks(uart);
 	}
 }
 
@@ -673,9 +670,13 @@ void __init omap_serial_init_port(int port)
 	pdev = &uart->pdev;
 	dev = &pdev->dev;
 
+	omap_uart_enable_clocks(uart);
+
 	omap_uart_reset(uart);
 	omap_uart_idle_init(uart);
 
+	list_add_tail(&uart->node, &uart_list);
+
 	if (WARN_ON(platform_device_register(pdev)))
 		return;