From: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Date: Tue, 31 Jul 2007 07:38:55 +0000 (-0700)
Subject: serial: fix vr41xx_siu interface select
X-Git-Tag: v2.6.23-rc2~75
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a95d32094c6564c3be62ef6b396b24ced564932f;p=~emulex%2Finfiniband.git

serial: fix vr41xx_siu interface select

only PORT_VR41XX_SIU can select interface.

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/serial/vr41xx_siu.c b/drivers/serial/vr41xx_siu.c
index aa382e2ea39..0b350971fd3 100644
--- a/drivers/serial/vr41xx_siu.c
+++ b/drivers/serial/vr41xx_siu.c
@@ -800,7 +800,8 @@ static int __init siu_console_setup(struct console *con, char *options)
 		port->membase = ioremap(port->mapbase, siu_port_size(port));
 	}
 
-	vr41xx_select_siu_interface(SIU_INTERFACE_RS232C);
+	if (port->type == PORT_VR41XX_SIU)
+		vr41xx_select_siu_interface(SIU_INTERFACE_RS232C);
 
 	if (options != NULL)
 		uart_parse_options(options, &baud, &parity, &bits, &flow);