From 53385c0a944df00209493b3b626dd646d7ac7d3d Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Mon, 4 Mar 2013 11:09:25 +0200 Subject: [PATCH] --- yaml --- r: 374621 b: refs/heads/master c: 77101ce578bb365e44c2944d6c338c68206e6e10 h: refs/heads/master i: 374619: b272fdb4569bf71a5bd87e1746ec214e094ae1eb v: v3 --- [refs] | 2 +- trunk/drivers/dma/dmatest.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 34ea9c9d58da..2cde0747e542 100644 --- 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 index a2c8904b63ea..e6b4cfa1eb7f 100644 --- 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);