]> git.karo-electronics.de Git - linux-beck.git/commitdiff
mtd: fsmc_nand: match wait_for_completion_timeout return type
authorNicholas Mc Guire <hofrat@osadl.org>
Fri, 13 Mar 2015 11:54:46 +0000 (07:54 -0400)
committerBrian Norris <computersforpeace@gmail.com>
Thu, 7 May 2015 06:48:04 +0000 (23:48 -0700)
return type of wait_for_completion_timeout is unsigned long not int. An
appropriately named unsigned long is added and the assignment fixed up.
This not only should help readability but also handles corner cases
properly.

Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
drivers/mtd/nand/fsmc_nand.c

index b6306b19a31ab8da53062d820f0b245e98ecd155..793872f180657e65e7d82237853b511dd72e82b3 100644 (file)
@@ -562,6 +562,7 @@ static int dma_xfer(struct fsmc_nand_data *host, void *buffer, int len,
        dma_cookie_t cookie;
        unsigned long flags = DMA_CTRL_ACK | DMA_PREP_INTERRUPT;
        int ret;
+       unsigned long time_left;
 
        if (direction == DMA_TO_DEVICE)
                chan = host->write_dma_chan;
@@ -601,10 +602,10 @@ static int dma_xfer(struct fsmc_nand_data *host, void *buffer, int len,
 
        dma_async_issue_pending(chan);
 
-       ret =
+       time_left =
        wait_for_completion_timeout(&host->dma_access_complete,
                                msecs_to_jiffies(3000));
-       if (ret == 0) {
+       if (time_left == 0) {
                dmaengine_terminate_all(chan);
                dev_err(host->dev, "wait_for_completion_timeout\n");
                ret = -ETIMEDOUT;