From b243f5c967656bf7c5d04297cb8b4cc9909db344 Mon Sep 17 00:00:00 2001 From: Matt Schulte Date: Tue, 20 Nov 2012 11:23:56 -0600 Subject: [PATCH] --- yaml --- r: 338457 b: refs/heads/master c: b7a7e14f654c80dfd3aa514adee663c74cfa4be9 h: refs/heads/master i: 338455: 3eb4a0528703aa6635b5632d296e1bf191354076 v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/8250/8250.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 549c413a0918..5723f97658d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d02f81555362e0032080af62154dca00d5ec99e0 +refs/heads/master: b7a7e14f654c80dfd3aa514adee663c74cfa4be9 diff --git a/trunk/drivers/tty/serial/8250/8250.c b/trunk/drivers/tty/serial/8250/8250.c index 3624df674a31..39d970719f7d 100644 --- a/trunk/drivers/tty/serial/8250/8250.c +++ b/trunk/drivers/tty/serial/8250/8250.c @@ -911,9 +911,9 @@ static void autoconfig_16550a(struct uart_8250_port *up) * found at offset 0x09. Instead check the Deice ID (DVID) * register for a 2, 4 or 8 port UART. */ - status1 = serial_in(up, UART_EXAR_DVID); - if (status1 == 0x82 || status1 == 0x84 || status1 == 0x88) { - if (up->port.flags & UPF_EXAR_EFR) { + if (up->port.flags & UPF_EXAR_EFR) { + status1 = serial_in(up, UART_EXAR_DVID); + if (status1 == 0x82 || status1 == 0x84 || status1 == 0x88) { DEBUG_AUTOCONF("Exar XR17V35x "); up->port.type = PORT_XR17V35X; up->capabilities |= UART_CAP_AFE | UART_CAP_EFR |