1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
index 33f3c3c54dbc..6e44d3268fcb 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
@@ -446,7 +446,7 @@ int start_dma_without_bch_irq(struct gpmi_nand_data *this,
                                 struct dma_async_tx_descriptor *desc)
 {
         struct completion *dma_c = &this->dma_done;
-        int err;
+        unsigned long timeout;
 
         init_completion(dma_c);
 
@@ -456,8 +456,8 @@ int start_dma_without_bch_irq(struct gpmi_nand_data *this,
         dma_async_issue_pending(get_dma_chan(this));
 
         /* Wait for the interrupt from the DMA block. */
-        err = wait_for_completion_timeout(dma_c, msecs_to_jiffies(1000));
-        if (!err) {
+        timeout = wait_for_completion_timeout(dma_c, msecs_to_jiffies(1000));
+        if (!timeout) {
                 dev_err(this->dev, "DMA timeout, last DMA :%d\n",
                         this->last_dma_type);
                 gpmi_dump_info(this);
@@ -477,7 +477,7 @@ int start_dma_with_bch_irq(struct gpmi_nand_data *this,
                         struct dma_async_tx_descriptor *desc)
 {
         struct completion *bch_c = &this->bch_done;
-        int err;
+        unsigned long timeout;
 
         /* Prepare to receive an interrupt from the BCH block. */
         init_completion(bch_c);
@@ -486,8 +486,8 @@ int start_dma_with_bch_irq(struct gpmi_nand_data *this,
         start_dma_without_bch_irq(this, desc);
 
         /* Wait for the interrupt from the BCH block. */
-        err = wait_for_completion_timeout(bch_c, msecs_to_jiffies(1000));
-        if (!err) {
+        timeout = wait_for_completion_timeout(bch_c, msecs_to_jiffies(1000));
+        if (!timeout) {
                 dev_err(this->dev, "BCH timeout, last DMA :%d\n",
                         this->last_dma_type);
                 gpmi_dump_info(this);