From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 14 Jul 2014 17:06:53 +0000 (-0700)
Subject: 3.15-stable patches
X-Git-Tag: v3.4.99~48
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2fd84be8ac4966170bb1594ea1cd4d3c29fb7187;p=thirdparty%2Fkernel%2Fstable-queue.git

3.15-stable patches

added patches:
	serial-imx-fix-build-breakage.patch
---

diff --git a/queue-3.15/serial-imx-fix-build-breakage.patch b/queue-3.15/serial-imx-fix-build-breakage.patch
new file mode 100644
index 00000000000..1365bbbcea5
--- /dev/null
+++ b/queue-3.15/serial-imx-fix-build-breakage.patch
@@ -0,0 +1,32 @@
+From 8bec751bd63847b4044aab8b215db52aa6abde61 Mon Sep 17 00:00:00 2001
+From: Peter Hurley <peter@hurleysoftware.com>
+Date: Thu, 10 Jul 2014 22:36:46 -0400
+Subject: serial: imx: Fix build breakage
+
+From: Peter Hurley <peter@hurleysoftware.com>
+
+commit 8bec751bd63847b4044aab8b215db52aa6abde61 upstream.
+
+Fix breakage introduced by
+commit c557d392fbf5badd693ea1946a4317c87a26a716,
+'serial: Test for no tx data on tx restart'.
+
+Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
+Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/tty/serial/imx.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/tty/serial/imx.c
++++ b/drivers/tty/serial/imx.c
+@@ -563,7 +563,7 @@ static void imx_start_tx(struct uart_por
+ 	struct imx_port *sport = (struct imx_port *)port;
+ 	unsigned long temp;
+ 
+-	if (uart_circ_empty(&port.state->xmit))
++	if (uart_circ_empty(&port->state->xmit))
+ 		return;
+ 
+ 	if (USE_IRDA(sport)) {
diff --git a/queue-3.15/series b/queue-3.15/series
index f4513fdb30a..a1405459e7f 100644
--- a/queue-3.15/series
+++ b/queue-3.15/series
@@ -11,3 +11,4 @@ cpuset-mempolicy-fix-sleeping-function-called-from-invalid-context.patch
 workqueue-zero-cpumask-of-wq_numa_possible_cpumask-on-init.patch
 ahci-imx-manage-only-sata_ref_clk-in-imx_sata_enable.patch
 i8k-fix-non-smp-operation.patch
+serial-imx-fix-build-breakage.patch