Function s3c24xx_serial_start_tx_pio() enables interrupts if needed,
so we don't have to (or even we shouldn't) enable them before.

Signed-off-by: Robert Baldyga <[email protected]>
---
 drivers/tty/serial/samsung.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
index 024e5ec..a07fe4f 100644
--- a/drivers/tty/serial/samsung.c
+++ b/drivers/tty/serial/samsung.c
@@ -358,15 +358,8 @@ void s3c24xx_serial_start_tx(struct uart_port *port)
                        s3c24xx_serial_rx_disable(port);
 
                tx_enabled(port) = 1;
-               if (!ourport->dma || !ourport->dma->tx_chan) {
-                       if (s3c24xx_serial_has_interrupt_mask(port))
-                               __clear_bit(S3C64XX_UINTM_TXD,
-                                               portaddrl(port, S3C64XX_UINTM));
-                       else
-                               enable_irq(ourport->tx_irq);
-
+               if (!ourport->dma || !ourport->dma->tx_chan)
                        s3c24xx_serial_start_tx_pio(ourport);
-               }
        }
 
        if (ourport->dma && ourport->dma->tx_chan) {
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to