Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 304186
b: refs/heads/master
c: 5181fb3
h: refs/heads/master
v: v3
  • Loading branch information
Tomoya MORINAGA authored and Greg Kroah-Hartman committed Apr 9, 2012
1 parent d6da1e4 commit b3b60ee
Show file tree
Hide file tree
Showing 2 changed files with 14 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: b23954a3f73a68a80f260bd3569a81ccc6d13670
refs/heads/master: 5181fb3d51d2d886ec9b2fed13a9ad9d5d67ec1f
15 changes: 13 additions & 2 deletions trunk/drivers/tty/serial/pch_uart.c
Original file line number Diff line number Diff line change
Expand Up @@ -1043,10 +1043,15 @@ static irqreturn_t pch_uart_interrupt(int irq, void *dev_id)
int ret = 0;
unsigned char iid;
unsigned long flags;
int next = 1;
u8 msr;

spin_lock_irqsave(&priv->port.lock, flags);
handled = 0;
while ((iid = pch_uart_hal_get_iid(priv)) > 1) {
while (next) {
iid = pch_uart_hal_get_iid(priv);
if (iid & PCH_UART_IIR_IP) /* No Interrupt */
break;
switch (iid) {
case PCH_UART_IID_RLS: /* Receiver Line Status */
lsr = pch_uart_hal_get_line_status(priv);
Expand Down Expand Up @@ -1080,12 +1085,18 @@ static irqreturn_t pch_uart_interrupt(int irq, void *dev_id)
ret = handle_tx(priv);
break;
case PCH_UART_IID_MS: /* Modem Status */
ret = PCH_UART_HANDLED_MS_INT;
msr = pch_uart_hal_get_modem(priv);
next = 0; /* MS ir prioirty is the lowest. So, MS ir
means final interrupt */
if ((msr & UART_MSR_ANY_DELTA) == 0)
break;
ret |= PCH_UART_HANDLED_MS_INT;
break;
default: /* Never junp to this label */
dev_err(priv->port.dev, "%s:iid=%02x (%lu)\n", __func__,
iid, jiffies);
ret = -1;
next = 0;
break;
}
handled |= (unsigned int)ret;
Expand Down

0 comments on commit b3b60ee

Please sign in to comment.