From: David S. Miller <davem@sunset.davemloft.net>
Date: Wed, 23 Aug 2006 22:53:39 +0000 (-0700)
Subject: [SERIAL] sunzilog: Mirror the sunsab serial setup bug fix.
X-Git-Tag: v2.6.18-rc5~65
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b8b99e857d0e258b0da17e55466e5142465d35fd;p=linux-2.6-omap-h63xx.git

[SERIAL] sunzilog: Mirror the sunsab serial setup bug fix.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c
index 47bc3d57e01..d34f336d53d 100644
--- a/drivers/serial/sunzilog.c
+++ b/drivers/serial/sunzilog.c
@@ -1146,6 +1146,9 @@ static int __init sunzilog_console_setup(struct console *con, char *options)
 	unsigned long flags;
 	int baud, brg;
 
+	if (up->port.type != PORT_SUNZILOG)
+		return -1;
+
 	printk(KERN_INFO "Console: ttyS%d (SunZilog zs%d)\n",
 	       (sunzilog_reg.minor - 64) + con->index, con->index);