From 358147ab113f90cce2a4210a65970e95d47f4ee6 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: 32991 b: refs/heads/master c:
 171505dafef56e4c84c48399b36604f4be55cf36 h: refs/heads/master i:   32989:
 6ca7d8d65d640bb64bdfa22e4afc978f217b70fc   32987:
 01caca94e773c39a5bf2f6a144583f8a72647181   32983:
 7dd6dea7e02ff0208fb52a5df72152fff58bbaf2   32975:
 5672a0e4e892c04ec599733498c8dc2ca6fe6db2   32959:
 659ed8ea9483830ee1dc3f94ab49860133c32b1d 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 4ce52c9b7e47..672be4a98230 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8cffc6ac66a2b251df2490702923611aa4ac1fc5
+refs/heads/master: 171505dafef56e4c84c48399b36604f4be55cf36
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) {