---

yaml --- r: 347147 b: refs/heads/master c: 928aa2a h: refs/heads/master i: 347145: ac161ae 347143: 0fd86cd v: v3
git-mirror · Nov 15, 2012 · 09e9167 · 09e9167
1 parent 2f4a3b0
commit 09e9167
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 605add7db6e84ff78f7ca96541c0880f0166e387
+refs/heads/master: 928aa2aeb7269292ca1e3d0e5e2e5d08af13da3d
diff --git a/trunk/drivers/mtd/nand/fsmc_nand.c b/trunk/drivers/mtd/nand/fsmc_nand.c
@@ -601,7 +601,7 @@ static int dma_xfer(struct fsmc_nand_data *host, void *buffer, int len,
 	dma_async_issue_pending(chan);
 
 	ret =
-	wait_for_completion_interruptible_timeout(&host->dma_access_complete,
+	wait_for_completion_timeout(&host->dma_access_complete,
 				msecs_to_jiffies(3000));
 	if (ret <= 0) {
 		chan->device->device_control(chan, DMA_TERMINATE_ALL, 0);