From 0659c944f699c8be3b550a62c051ef039b635818 Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Tue, 4 Jul 2006 14:11:23 +1000
Subject: [PATCH] --- yaml --- r: 34019 b: refs/heads/master c:
 e70e943847bdae13175bf3a8bca6328e369de90a h: refs/heads/master i:   34017:
 855f93383ccd7d1bdebb33d73f72eaa37b6e4965   34015:
 f5e1ec835a1743bc57e5764ad62813cb1bfe3853 v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/powerpc/kernel/udbg_16550.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7e2e73fd02a8..5302ecd7fd1d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e031d65b0cb5f882b20ebc356ea0345ff18dbf0
+refs/heads/master: e70e943847bdae13175bf3a8bca6328e369de90a
diff --git a/trunk/arch/powerpc/kernel/udbg_16550.c b/trunk/arch/powerpc/kernel/udbg_16550.c
index 0835b4841dea..2d17f2b8eda7 100644
--- a/trunk/arch/powerpc/kernel/udbg_16550.c
+++ b/trunk/arch/powerpc/kernel/udbg_16550.c
@@ -81,10 +81,14 @@ static int udbg_550_getc(void)
 void udbg_init_uart(void __iomem *comport, unsigned int speed,
 		    unsigned int clock)
 {
-	unsigned int dll, base_bauds = clock / 16;
+	unsigned int dll, base_bauds;
 
+	if (clock == 0)
+		clock = 1843200;
 	if (speed == 0)
 		speed = 9600;
+
+	base_bauds = clock / 16;
 	dll = base_bauds / speed;
 
 	if (comport) {