From a46085b93345d17db2873a26bfccda896cde8264 Mon Sep 17 00:00:00 2001 From: Tomoya MORINAGA Date: Mon, 26 Mar 2012 14:43:04 +0900 Subject: [PATCH] --- yaml --- r: 304187 b: refs/heads/master c: 159d4e1e73dc2c4745b3edb2f2ae51caaae37e5f h: refs/heads/master i: 304185: d6da1e40ac4ddccc235878ac02fd6f872d183b91 304183: 2786fae89d6b621c834f2f11d3cc25a041493afe v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/pch_uart.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 73a49a4246e1..bb5757f71e06 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5181fb3d51d2d886ec9b2fed13a9ad9d5d67ec1f +refs/heads/master: 159d4e1e73dc2c4745b3edb2f2ae51caaae37e5f diff --git a/trunk/drivers/tty/serial/pch_uart.c b/trunk/drivers/tty/serial/pch_uart.c index d11096c8ca81..d2873c67d25d 100644 --- a/trunk/drivers/tty/serial/pch_uart.c +++ b/trunk/drivers/tty/serial/pch_uart.c @@ -228,7 +228,6 @@ struct eg20t_port { int start_tx; int start_rx; int tx_empty; - int int_dis_flag; int trigger; int trigger_level; struct pch_uart_buffer rxbuf; @@ -1101,10 +1100,6 @@ static irqreturn_t pch_uart_interrupt(int irq, void *dev_id) } handled |= (unsigned int)ret; } - if (handled == 0 && iid <= 1) { - if (priv->int_dis_flag) - priv->int_dis_flag = 0; - } spin_unlock_irqrestore(&priv->port.lock, flags); return IRQ_RETVAL(handled); @@ -1199,7 +1194,6 @@ static void pch_uart_stop_rx(struct uart_port *port) priv = container_of(port, struct eg20t_port, port); priv->start_rx = 0; pch_uart_hal_disable_interrupt(priv, PCH_UART_HAL_RX_INT); - priv->int_dis_flag = 1; } /* Enable the modem status interrupts. */