From df3311d4a524efa3ba68b6bfac8e2d032ade8d4a Mon Sep 17 00:00:00 2001 From: Matt Schulte Date: Wed, 21 Nov 2012 09:40:49 -0600 Subject: [PATCH] --- yaml --- r: 338460 b: refs/heads/master c: 30fa96a34694d93bf76311944c9521bbcdd4e58e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/8250/8250.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 766b3be07de6..164aeb8a309a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 81db0772dc16b31185418f51ce6a1c0098a84367 +refs/heads/master: 30fa96a34694d93bf76311944c9521bbcdd4e58e diff --git a/trunk/drivers/tty/serial/8250/8250.c b/trunk/drivers/tty/serial/8250/8250.c index 4ab8af797ad9..d085e3a8ec06 100644 --- a/trunk/drivers/tty/serial/8250/8250.c +++ b/trunk/drivers/tty/serial/8250/8250.c @@ -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); @@ -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; }