From de7974b0181235e824e1616557a4ca4d74f831cd Mon Sep 17 00:00:00 2001 From: Grant Likely Date: Mon, 7 May 2007 01:38:51 +1000 Subject: [PATCH] --- yaml --- r: 55034 b: refs/heads/master c: a3481197783c187707090504062488862768260a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/serial/mpc52xx_uart.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2f6e54cfd134..092a933d9664 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3a5cc44268d9c3eee301f366801005e331b1e871 +refs/heads/master: a3481197783c187707090504062488862768260a diff --git a/trunk/drivers/serial/mpc52xx_uart.c b/trunk/drivers/serial/mpc52xx_uart.c index f8c1761eb57f..35f8b86cc78f 100644 --- a/trunk/drivers/serial/mpc52xx_uart.c +++ b/trunk/drivers/serial/mpc52xx_uart.c @@ -257,9 +257,10 @@ mpc52xx_uart_shutdown(struct uart_port *port) { struct mpc52xx_psc __iomem *psc = PSC(port); - /* Shut down the port, interrupt and all */ + /* Shut down the port. Leave TX active if on a console port */ out_8(&psc->command,MPC52xx_PSC_RST_RX); - out_8(&psc->command,MPC52xx_PSC_RST_TX); + if (!uart_console(port)) + out_8(&psc->command,MPC52xx_PSC_RST_TX); port->read_status_mask = 0; out_be16(&psc->mpc52xx_psc_imr,port->read_status_mask);