diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2013-12-10 14:54:42 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-17 09:36:23 -0800 |
| commit | 30ae5859186f564d40cee04579e901e41c3826e2 (patch) | |
| tree | 32618b0c528939a5251a0eaaf55b6c64bd08fb4d /drivers/tty/serial/amba-pl011.c | |
| parent | 570d291048aecc02271884f6a5f50ad555f271a5 (diff) | |
| download | linux-30ae5859186f564d40cee04579e901e41c3826e2.tar.gz linux-30ae5859186f564d40cee04579e901e41c3826e2.tar.bz2 linux-30ae5859186f564d40cee04579e901e41c3826e2.zip | |
serial: pl011: (cosmetic) remove superfluous register write
In pl011_rx_chars() if pl011_dma_rx_trigger_dma() succeeds it will disable
the receive interrupt, no need to do this again.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/amba-pl011.c')
| -rw-r--r-- | drivers/tty/serial/amba-pl011.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index 182a922e1942..ea6c2a3798ff 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -1214,8 +1214,8 @@ __acquires(&uap->port.lock) dev_dbg(uap->port.dev, "could not trigger RX DMA job " "fall back to interrupt mode again\n"); uap->im |= UART011_RXIM; + writew(uap->im, uap->port.membase + UART011_IMSC); } else { - uap->im &= ~UART011_RXIM; #ifdef CONFIG_DMA_ENGINE /* Start Rx DMA poll */ if (uap->dmarx.poll_rate) { @@ -1227,8 +1227,6 @@ __acquires(&uap->port.lock) } #endif } - - writew(uap->im, uap->port.membase + UART011_IMSC); } spin_lock(&uap->port.lock); } |