summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>2007-07-31 00:38:55 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-31 15:39:41 -0700
commita95d32094c6564c3be62ef6b396b24ced564932f (patch)
tree02dae934b5bf46e6d97a16077383b4a72b82bc1c
parenta24ac9fba1d122ce2536d23b8f4c47a17b7d0627 (diff)
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>
-rw-r--r--drivers/serial/vr41xx_siu.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/serial/vr41xx_siu.c b/drivers/serial/vr41xx_siu.c
index aa382e2ea397..0b350971fd32 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);