---

yaml --- r: 33452 b: refs/heads/master c: b8b99e8 h: refs/heads/master v: v3
git-mirror · Aug 23, 2006 · 10dfd45 · 10dfd45
1 parent 8fbd0f2
commit 10dfd45
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f4184f73d5233214d3225a94fcf1bd4d6678d74
+refs/heads/master: b8b99e857d0e258b0da17e55466e5142465d35fd
diff --git a/trunk/drivers/serial/sunzilog.c b/trunk/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);