Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 338469
b: refs/heads/master
c: d7ffb93
h: refs/heads/master
i:
  338467: a8ee377
v: v3
  • Loading branch information
Huang Shijie authored and Greg Kroah-Hartman committed Nov 26, 2012
1 parent 5fa4624 commit 94a9aa6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a5919442bc61846e36011671df0d67c72275337e
refs/heads/master: d7ffb9329012a517575e4c4d49480b6ce0d1529e
2 changes: 2 additions & 0 deletions trunk/drivers/tty/serial/mxs-auart.c
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,8 @@ static void dma_rx_callback(void *arg)
int count;
u32 stat;

dma_unmap_sg(s->dev, &s->rx_sgl, 1, DMA_FROM_DEVICE);

stat = readl(s->port.membase + AUART_STAT);
stat &= ~(AUART_STAT_OERR | AUART_STAT_BERR |
AUART_STAT_PERR | AUART_STAT_FERR);
Expand Down

0 comments on commit 94a9aa6

Please sign in to comment.