From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 24 Oct 2014 22:55:50 +0000 (+0800)
Subject: 3.14-stable patches
X-Git-Tag: v3.10.59~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=841446ab2833266cd62597df05f13ad250942822;p=thirdparty%2Fkernel%2Fstable-queue.git

3.14-stable patches

added patches:
	spi-dw-mid-terminate-ongoing-transfers-at-exit.patch
---

diff --git a/queue-3.14/series b/queue-3.14/series
index da7113329d1..9212ef3c244 100644
--- a/queue-3.14/series
+++ b/queue-3.14/series
@@ -54,3 +54,4 @@ kernel-add-support-for-gcc-5.patch
 futex-ensure-get_futex_key_refs-always-implies-a-barrier.patch
 powerpc-iommu-ddw-fix-endianness.patch
 ima-provide-flag-to-identify-new-empty-files.patch
+spi-dw-mid-terminate-ongoing-transfers-at-exit.patch
diff --git a/queue-3.14/spi-dw-mid-terminate-ongoing-transfers-at-exit.patch b/queue-3.14/spi-dw-mid-terminate-ongoing-transfers-at-exit.patch
new file mode 100644
index 00000000000..70082171440
--- /dev/null
+++ b/queue-3.14/spi-dw-mid-terminate-ongoing-transfers-at-exit.patch
@@ -0,0 +1,33 @@
+From 8e45ef682cb31fda62ed4eeede5d9745a0a1b1e2 Mon Sep 17 00:00:00 2001
+From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+Date: Thu, 18 Sep 2014 20:08:53 +0300
+Subject: spi: dw-mid: terminate ongoing transfers at exit
+
+From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+
+commit 8e45ef682cb31fda62ed4eeede5d9745a0a1b1e2 upstream.
+
+Do full clean up at exit, means terminate all ongoing DMA transfers.
+
+Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/spi/spi-dw-mid.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/drivers/spi/spi-dw-mid.c
++++ b/drivers/spi/spi-dw-mid.c
+@@ -91,7 +91,11 @@ static void mid_spi_dma_exit(struct dw_s
+ {
+ 	if (!dws->dma_inited)
+ 		return;
++
++	dmaengine_terminate_all(dws->txchan);
+ 	dma_release_channel(dws->txchan);
++
++	dmaengine_terminate_all(dws->rxchan);
+ 	dma_release_channel(dws->rxchan);
+ }
+