From 8fbd0f206e01354fd7e672aa9775f318d8c456ea Mon Sep 17 00:00:00 2001
From: Marc Zyngier <maz@misterjones.org>
Date: Wed, 23 Aug 2006 15:50:57 -0700
Subject: [PATCH] --- yaml --- r: 33451 b: refs/heads/master c:
 0f4184f73d5233214d3225a94fcf1bd4d6678d74 h: refs/heads/master i:   33449:
 8597cef0488ea71eddb800eaf33d2d19f169cf3e   33447:
 0618b3c0e92a292695463fc06eff07540951fc18 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/serial/sunsab.c | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b97e0bea2843..86ef1e23451f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25848c4e502ec2bb94ee1f3c82709311059d0857
+refs/heads/master: 0f4184f73d5233214d3225a94fcf1bd4d6678d74
diff --git a/trunk/drivers/serial/sunsab.c b/trunk/drivers/serial/sunsab.c
index dc673e1b6fd9..cfe20f730436 100644
--- a/trunk/drivers/serial/sunsab.c
+++ b/trunk/drivers/serial/sunsab.c
@@ -886,6 +886,15 @@ static int sunsab_console_setup(struct console *con, char *options)
 	unsigned long flags;
 	unsigned int baud, quot;
 
+	/*
+	 * The console framework calls us for each and every port
+	 * registered. Defer the console setup until the requested
+	 * port has been properly discovered. A bit of a hack,
+	 * though...
+	 */
+	if (up->port.type != PORT_SUNSAB)
+		return -1;
+
 	printk("Console: ttyS%d (SAB82532)\n",
 	       (sunsab_reg.minor - 64) + con->index);