---

yaml --- r: 374621 b: refs/heads/master c: 77101ce h: refs/heads/master i: 374619: b272fdb v: v3
git-mirror · Apr 15, 2013 · 53385c0 · 53385c0
1 parent ca55c34
commit 53385c0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a37f644046c2f5b7889be642487e6f9dd58c5d7
+refs/heads/master: 77101ce578bb365e44c2944d6c338c68206e6e10
diff --git a/trunk/drivers/dma/dmatest.c b/trunk/drivers/dma/dmatest.c
@@ -454,7 +454,8 @@ static int dmatest_func(void *data)
 		}
 		dma_async_issue_pending(chan);
 
-		wait_event_freezable_timeout(done_wait, done.done,
+		wait_event_freezable_timeout(done_wait,
+					     done.done || kthread_should_stop(),
 					     msecs_to_jiffies(timeout));
 
 		status = dma_async_is_tx_complete(chan, cookie, NULL, NULL);