]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
3.10-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 24 Oct 2014 22:55:40 +0000 (06:55 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 24 Oct 2014 22:55:40 +0000 (06:55 +0800)
added patches:
spi-dw-mid-terminate-ongoing-transfers-at-exit.patch

queue-3.10/series
queue-3.10/spi-dw-mid-terminate-ongoing-transfers-at-exit.patch [new file with mode: 0644]

index 3161d236436145e901b34e904e336a2cbcb0a1c2..6dcde28dbbceb3eddb37e279204c7ce6ac3923c1 100644 (file)
@@ -34,3 +34,4 @@ bluetooth-fix-issue-with-usb-suspend-in-btusb-driver.patch
 mm-clear-__gfp_fs-when-pf_memalloc_noio-is-set.patch
 fanotify-enable-close-on-exec-on-events-fd-when-requested-in-fanotify_init.patch
 kernel-add-support-for-gcc-5.patch
+spi-dw-mid-terminate-ongoing-transfers-at-exit.patch
diff --git a/queue-3.10/spi-dw-mid-terminate-ongoing-transfers-at-exit.patch b/queue-3.10/spi-dw-mid-terminate-ongoing-transfers-at-exit.patch
new file mode 100644 (file)
index 0000000..7008217
--- /dev/null
@@ -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);
+ }