diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-25 14:57:22 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-25 14:57:22 -0400 |
| commit | ea8c17a4d5ef33cce5d57ca7c3b9a4c7a5ca61be (patch) | |
| tree | 9e0643099710539faaef43d916a50aabc9d81668 | |
| parent | 1cece0765ba98ad62382d8b198efeaf1abc637ec (diff) | |
| download | longterm-queue-4.12-ea8c17a4d5ef33cce5d57ca7c3b9a4c7a5ca61be.tar.gz | |
dma: add fix for fixes
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/dmaengine-dmatest-fix-container_of-member-in-dmatest.patch | 32 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 33 insertions, 0 deletions
diff --git a/queue/dmaengine-dmatest-fix-container_of-member-in-dmatest.patch b/queue/dmaengine-dmatest-fix-container_of-member-in-dmatest.patch new file mode 100644 index 0000000..b7f09ed --- /dev/null +++ b/queue/dmaengine-dmatest-fix-container_of-member-in-dmatest.patch @@ -0,0 +1,32 @@ +From 66b3bd2356e0a1531c71a3dcf96944621e25c17c Mon Sep 17 00:00:00 2001 +From: Yang Shunyong <shunyong.yang@hxt-semitech.com> +Date: Mon, 29 Jan 2018 14:40:11 +0800 +Subject: [PATCH] dmaengine: dmatest: fix container_of member in + dmatest_callback + +commit 66b3bd2356e0a1531c71a3dcf96944621e25c17c upstream. + +The type of arg passed to dmatest_callback is struct dmatest_done. +It refers to test_done in struct dmatest_thread, not done_wait. + +Fixes: 6f6a23a213be ("dmaengine: dmatest: move callback wait ...") +Signed-off-by: Yang Shunyong <shunyong.yang@hxt-semitech.com> +Acked-by: Adam Wallis <awallis@codeaurora.org> +Signed-off-by: Vinod Koul <vinod.koul@intel.com> + +diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c +index ec5f9d2bc820..80cc2be6483c 100644 +--- a/drivers/dma/dmatest.c ++++ b/drivers/dma/dmatest.c +@@ -355,7 +355,7 @@ static void dmatest_callback(void *arg) + { + struct dmatest_done *done = arg; + struct dmatest_thread *thread = +- container_of(arg, struct dmatest_thread, done_wait); ++ container_of(done, struct dmatest_thread, test_done); + if (!thread->done) { + done->done = true; + wake_up_all(done->wait); +-- +2.15.0 + diff --git a/queue/series b/queue/series index 01e207f..44bd6ea 100644 --- a/queue/series +++ b/queue/series @@ -20,6 +20,7 @@ dm-fix-various-targets-to-dm_register_target-after-m.patch iw_cxgb4-only-insert-drain-cqes-if-wq-is-flushed.patch eeprom-at24-change-nvmem-stride-to-1.patch dmaengine-dmatest-move-callback-wait-queue-to-thread.patch +dmaengine-dmatest-fix-container_of-member-in-dmatest.patch ext4-fix-fdatasync-2-after-fallocate-2-operation.patch ext4-fix-crash-when-a-directory-s-i_size-is-too-smal.patch HID-cp2112-fix-broken-gpio_direction_input-callback.patch |