Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 299118
b: refs/heads/master
c: 57c3686
h: refs/heads/master
v: v3
  • Loading branch information
Siftar, Gabe authored and Greg Kroah-Hartman committed Apr 9, 2012
1 parent f1fb35f commit a3bd304
Show file tree
Hide file tree
Showing 2 changed files with 5 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: acede70d6561f2d042d9dbb153d9a3469479c0ed
refs/heads/master: 57c3686842114de3b0c00633591e9605c46fb769
4 changes: 4 additions & 0 deletions trunk/drivers/tty/serial/atmel_serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,8 @@ static void atmel_start_rx(struct uart_port *port)
{
UART_PUT_CR(port, ATMEL_US_RSTSTA); /* reset status and receiver */

UART_PUT_CR(port, ATMEL_US_RXEN);

if (atmel_use_dma_rx(port)) {
/* enable PDC controller */
UART_PUT_IER(port, ATMEL_US_ENDRX | ATMEL_US_TIMEOUT |
Expand All @@ -404,6 +406,8 @@ static void atmel_start_rx(struct uart_port *port)
*/
static void atmel_stop_rx(struct uart_port *port)
{
UART_PUT_CR(port, ATMEL_US_RXDIS);

if (atmel_use_dma_rx(port)) {
/* disable PDC receive */
UART_PUT_PTCR(port, ATMEL_PDC_RXTDIS);
Expand Down

0 comments on commit a3bd304

Please sign in to comment.