Skip to content

Commit

Permalink
[SERIAL] Make uart_line_info() correctly tell MMIO from I/O port
Browse files Browse the repository at this point in the history
/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>
  • Loading branch information
Sergei Shtylyov authored and Russell King committed Oct 1, 2006
1 parent a4b7757 commit 6c6a233
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/serial/serial_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1662,16 +1662,16 @@ static int uart_line_info(char *buf, struct uart_driver *drv, int i)
struct uart_port *port = state->port;
char stat_buf[32];
unsigned int status;
int ret;
int mmio, ret;

if (!port)
return 0;

mmio = port->iotype >= UPIO_MEM;
ret = sprintf(buf, "%d: uart:%s %s%08lX irq:%d",
port->line, uart_type(port),
port->iotype == UPIO_MEM ? "mmio:0x" : "port:",
port->iotype == UPIO_MEM ? port->mapbase :
(unsigned long) port->iobase,
mmio ? "mmio:0x" : "port:",
mmio ? port->mapbase : (unsigned long) port->iobase,
port->irq);

if (port->type == PORT_UNKNOWN) {
Expand Down

0 comments on commit 6c6a233

Please sign in to comment.