diff --git a/[refs] b/[refs] index d79b58cc7593..777124ff8ad8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 977757311e50dc5d832c9fef34e7555411f7ccd8 +refs/heads/master: 2e1463922a35584c863f71d4021e1e71f76eaed0 diff --git a/trunk/drivers/serial/imx.c b/trunk/drivers/serial/imx.c index 49f2e12ba58d..e6c2ba26dcbb 100644 --- a/trunk/drivers/serial/imx.c +++ b/trunk/drivers/serial/imx.c @@ -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. */