From a805fe14ee7345b0abbd36f360b7adc938c6fb00 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 25 Oct 2014 06:55:59 +0800 Subject: [PATCH] 3.16-stable patches added patches: spi-dw-mid-terminate-ongoing-transfers-at-exit.patch --- queue-3.16/series | 1 + ...-terminate-ongoing-transfers-at-exit.patch | 33 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 queue-3.16/spi-dw-mid-terminate-ongoing-transfers-at-exit.patch diff --git a/queue-3.16/series b/queue-3.16/series index 813bdb3b9c0..c6fc71322a5 100644 --- a/queue-3.16/series +++ b/queue-3.16/series @@ -55,6 +55,7 @@ nfs-fix-an-uninitialised-pointer-oops-in-the-writeback-error-path.patch nfs-fix-a-bogus-warning-in-nfs_generic_pgio.patch iwlwifi-mvm-disable-bt-co-running-by-default.patch iwlwifi-add-missing-pci-ids-for-the-7260-series.patch +spi-dw-mid-terminate-ongoing-transfers-at-exit.patch pci-mvebu-fix-uninitialized-variable-in-mvebu_get_tgt_attr.patch pci-add-missing-mem_64-mask-in-pci_assign_unassigned_bridge_resources.patch pci-increase-ibm-ipr-sas-crocodile-bars-to-at-least-system-page-size.patch diff --git a/queue-3.16/spi-dw-mid-terminate-ongoing-transfers-at-exit.patch b/queue-3.16/spi-dw-mid-terminate-ongoing-transfers-at-exit.patch new file mode 100644 index 00000000000..70082171440 --- /dev/null +++ b/queue-3.16/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); + } + -- 2.47.3