Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 338460
b: refs/heads/master
c: 30fa96a
h: refs/heads/master
v: v3
  • Loading branch information
Matt Schulte authored and Greg Kroah-Hartman committed Nov 22, 2012
1 parent 49c31c5 commit df3311d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 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: 81db0772dc16b31185418f51ce6a1c0098a84367
refs/heads/master: 30fa96a34694d93bf76311944c9521bbcdd4e58e
6 changes: 4 additions & 2 deletions trunk/drivers/tty/serial/8250/8250.c
Original file line number Diff line number Diff line change
Expand Up @@ -1578,7 +1578,8 @@ static int exar_handle_irq(struct uart_port *port)

ret = serial8250_handle_irq(port, iir);

if (port->type == PORT_XR17V35X) {
if ((port->type == PORT_XR17V35X) ||
(port->type == PORT_XR17D15X)) {
int0 = serial_port_in(port, 0x80);
int1 = serial_port_in(port, 0x81);
int2 = serial_port_in(port, 0x82);
Expand Down Expand Up @@ -2689,7 +2690,8 @@ static void serial8250_config_port(struct uart_port *port, int flags)
serial8250_release_std_resource(up);

/* Fixme: probably not the best place for this */
if (port->type == PORT_XR17V35X)
if ((port->type == PORT_XR17V35X) ||
(port->type == PORT_XR17D15X))
port->handle_irq = exar_handle_irq;
}

Expand Down

0 comments on commit df3311d

Please sign in to comment.