Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 338457
b: refs/heads/master
c: b7a7e14
h: refs/heads/master
i:
  338455: 3eb4a05
v: v3
  • Loading branch information
Matt Schulte authored and Greg Kroah-Hartman committed Nov 22, 2012
1 parent 96052fb commit b243f5c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d02f81555362e0032080af62154dca00d5ec99e0
refs/heads/master: b7a7e14f654c80dfd3aa514adee663c74cfa4be9
6 changes: 3 additions & 3 deletions trunk/drivers/tty/serial/8250/8250.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down

0 comments on commit b243f5c

Please sign in to comment.