diff options
| author | Gordon Smith <gsmith@earthsciencesystems.com> | 2014-05-29 16:50:33 -0400 |
|---|---|---|
| committer | Anthony Felice <tony.felice@timesys.com> | 2014-05-29 16:51:02 -0400 |
| commit | f2453fae2ffaaa41233a42497732be9ef263746e (patch) | |
| tree | 86112909cf59995a39eafa21ac9310e9125236ee | |
| parent | 5c893c6f86a8a668609f311a60238c30a2d2edd5 (diff) | |
serial/mvf.c: Fix DMA channel deallocation.
Signed-off-by: Anthony Felice <tony.felice@timesys.com>
| -rw-r--r-- | drivers/tty/serial/mvf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/tty/serial/mvf.c b/drivers/tty/serial/mvf.c index 0ea0181cd455..af7c2c91489d 100644 --- a/drivers/tty/serial/mvf.c +++ b/drivers/tty/serial/mvf.c @@ -797,7 +797,7 @@ imx_set_termios(struct uart_port *port, struct ktermios *termios, brfa = ((sport->port.uartclk - (16 * sbr * baud)) * 2)/baud; bdh &= ~MXC_UARTBDH_SBR_MASK; - bdh |= (sbr >> 8) & 0x1F; + bdh |= (sbr >> 8) & MXC_UARTBDH_SBR_MASK; cr4 &= ~MXC_UARTCR4_BRFA_MASK; brfa &= MXC_UARTCR4_BRFA_MASK; @@ -1259,6 +1259,7 @@ static int serial_imx_probe(struct platform_device *pdev) if (pdata && (pdata->flags & IMXUART_EDMA)) { sport->enable_dma = 1; + sport->dma_tx_ch = -1; printk("IMX UART EDMA enabled\n"); } if (pdata && (pdata->flags & IMXUART_FIFO)) |