From: Greg Kroah-Hartman Date: Fri, 24 Oct 2014 22:55:40 +0000 (+0800) Subject: 3.10-stable patches X-Git-Tag: v3.10.59~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fa05dfb91e819395c939d7a3773e0e5a698b6744;p=thirdparty%2Fkernel%2Fstable-queue.git 3.10-stable patches added patches: spi-dw-mid-terminate-ongoing-transfers-at-exit.patch --- diff --git a/queue-3.10/series b/queue-3.10/series index 3161d236436..6dcde28dbbc 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -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 index 00000000000..70082171440 --- /dev/null +++ b/queue-3.10/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 +Date: Thu, 18 Sep 2014 20:08:53 +0300 +Subject: spi: dw-mid: terminate ongoing transfers at exit + +From: Andy Shevchenko + +commit 8e45ef682cb31fda62ed4eeede5d9745a0a1b1e2 upstream. + +Do full clean up at exit, means terminate all ongoing DMA transfers. + +Signed-off-by: Andy Shevchenko +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman + +--- + 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); + } +