From febf2a34efb43c7272a2bb82674502c5ce5e109b Mon Sep 17 00:00:00 2001 From: Tomoya MORINAGA Date: Fri, 11 Nov 2011 10:55:27 +0900 Subject: [PATCH] --- yaml --- r: 275781 b: refs/heads/master c: 90f04c2926cfb5bf74533b0a7766bc896f6a0c0e h: refs/heads/master i: 275779: 37c134d859e5a93373eb38595b5d2ef4d9a8b7bd v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/pch_uart.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 93df2b882ed8..128958ca4ab7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 604fdb75094a7367e1794fd0f62183380364ce13 +refs/heads/master: 90f04c2926cfb5bf74533b0a7766bc896f6a0c0e diff --git a/trunk/drivers/tty/serial/pch_uart.c b/trunk/drivers/tty/serial/pch_uart.c index ac852b5a8f93..d6aba8c087e4 100644 --- a/trunk/drivers/tty/serial/pch_uart.c +++ b/trunk/drivers/tty/serial/pch_uart.c @@ -632,6 +632,7 @@ static void pch_request_dma(struct uart_port *port) dev_err(priv->port.dev, "%s:dma_request_channel FAILS(Rx)\n", __func__); dma_release_channel(priv->chan_tx); + priv->chan_tx = NULL; return; } @@ -1219,8 +1220,7 @@ static void pch_uart_shutdown(struct uart_port *port) dev_err(priv->port.dev, "pch_uart_hal_set_fifo Failed(ret=%d)\n", ret); - if (priv->use_dma_flag) - pch_free_dma(port); + pch_free_dma(port); free_irq(priv->port.irq, priv); }