From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 23 Apr 2012 16:39:23 +0000 (-0700)
Subject: Merge 3.4-rc4 into tty-next
X-Git-Tag: firefly_0821_release~3680^2~2824^2~30
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=10af77c193681398e5dbe830db181d86047fcd41;p=firefly-linux-kernel-4.4.55.git

Merge 3.4-rc4 into tty-next

This resolves the merge problem with:
	drivers/tty/serial/pch_uart.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

10af77c193681398e5dbe830db181d86047fcd41
diff --cc drivers/tty/serial/pch_uart.c
index c2816f494807,a5e63438584f..4fdec6a6b758
--- a/drivers/tty/serial/pch_uart.c
+++ b/drivers/tty/serial/pch_uart.c
@@@ -1447,11 -1455,8 +1455,10 @@@ static int pch_uart_verify_port(struct 
  			__func__);
  		return -EOPNOTSUPP;
  #endif
- 		priv->use_dma_flag = 1;
 -		priv->use_dma = 1;
  		dev_info(priv->port.dev, "PCH UART : Use DMA Mode\n");
 +		if (!priv->use_dma)
 +			pch_request_dma(port);
 +		priv->use_dma = 1;
  	}
  
  	return 0;