Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 146307
b: refs/heads/master
c: 2e14639
h: refs/heads/master
i:
  146305: 2089a24
  146303: b8a4aff
v: v3
  • Loading branch information
Fabian Godehardt authored and Linus Torvalds committed Jun 11, 2009
1 parent d275849 commit 237597f
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: 977757311e50dc5d832c9fef34e7555411f7ccd8
refs/heads/master: 2e1463922a35584c863f71d4021e1e71f76eaed0
4 changes: 4 additions & 0 deletions trunk/drivers/serial/imx.c
Original file line number Diff line number Diff line change
Expand Up @@ -634,6 +634,10 @@ static void imx_shutdown(struct uart_port *port)
struct imx_port *sport = (struct imx_port *)port;
unsigned long temp;

temp = readl(sport->port.membase + UCR2);
temp &= ~(UCR2_TXEN);
writel(temp, sport->port.membase + UCR2);

/*
* Stop our timer.
*/
Expand Down

0 comments on commit 237597f

Please sign in to comment.