From 09e9167d9a4907b5aa70bba9100b269b495efc6b Mon Sep 17 00:00:00 2001 From: Vipin Kumar Date: Tue, 9 Oct 2012 16:14:48 +0530 Subject: [PATCH] --- yaml --- r: 347147 b: refs/heads/master c: 928aa2aeb7269292ca1e3d0e5e2e5d08af13da3d h: refs/heads/master i: 347145: ac161ae707e6dfa5a0af799caf99f8857ddcc961 347143: 0fd86cdcbdfc811f4fc1881c44522a7dc88ff550 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/fsmc_nand.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index dfa16479193f..4a6adae30187 100644 --- 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 index a5bc3d5511e3..82c0371f71e8 100644 --- 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);