aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSergei Shtylyov <sshtylyov@ru.mvista.com>2006-09-03 16:04:20 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-10-01 12:06:57 -0400
commit6c6a2334a1e8af7c3eaab992732825fa9ade77cf (patch)
treeb4eb67c9698c8fac9426dd16695306d20f6e3a35 /drivers
parenta4b775735c0dff5a8d59a877ff0033526b469116 (diff)
[SERIAL] Make uart_line_info() correctly tell MMIO from I/O port
/proc/tty/driver/serial incorrectly claims that UARTs having iotype of UPIO_MEM32, UPIO_AU, or UPIO_TSI are I/O mapped. Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/serial/serial_core.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index 5f7ba1adb309..d7e28ab4c313 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -1662,16 +1662,16 @@ static int uart_line_info(char *buf, struct uart_driver *drv, int i)
1662 struct uart_port *port = state->port; 1662 struct uart_port *port = state->port;
1663 char stat_buf[32]; 1663 char stat_buf[32];
1664 unsigned int status; 1664 unsigned int status;
1665 int ret; 1665 int mmio, ret;
1666 1666
1667 if (!port) 1667 if (!port)
1668 return 0; 1668 return 0;
1669 1669
1670 mmio = port->iotype >= UPIO_MEM;
1670 ret = sprintf(buf, "%d: uart:%s %s%08lX irq:%d", 1671 ret = sprintf(buf, "%d: uart:%s %s%08lX irq:%d",
1671 port->line, uart_type(port), 1672 port->line, uart_type(port),
1672 port->iotype == UPIO_MEM ? "mmio:0x" : "port:", 1673 mmio ? "mmio:0x" : "port:",
1673 port->iotype == UPIO_MEM ? port->mapbase : 1674 mmio ? port->mapbase : (unsigned long) port->iobase,
1674 (unsigned long) port->iobase,
1675 port->irq); 1675 port->irq);
1676 1676
1677 if (port->type == PORT_UNKNOWN) { 1677 if (port->type == PORT_UNKNOWN) {