Skip to content

Commit

Permalink
serial: samsung: remove redundant interrupt enabling
Browse files Browse the repository at this point in the history
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 <r.baldyga@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Robert Baldyga authored and Greg Kroah-Hartman committed Feb 2, 2015
1 parent 632f32e commit ba019a3
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions drivers/tty/serial/samsung.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit ba019a3

Please sign in to comment.