summaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host/moxart-mmc.c
diff options
context:
space:
mode:
authorNicholas Mc Guire <hofrat@osadl.org>2016-07-25 19:59:23 +0200
committerUlf Hansson <ulf.hansson@linaro.org>2016-09-26 21:31:07 +0200
commit41f469cac2663a41a7b0c84cb94e8f7024385ae4 (patch)
tree368e124793994c5ec79bd4b78fed1c097d5dbb9b /drivers/mmc/host/moxart-mmc.c
parent721e0497172f0fa661eed2d63367cddf479f35e8 (diff)
downloadlinux-41f469cac2663a41a7b0c84cb94e8f7024385ae4.tar.gz
linux-41f469cac2663a41a7b0c84cb94e8f7024385ae4.tar.bz2
linux-41f469cac2663a41a7b0c84cb94e8f7024385ae4.zip
mmc: moxart: fix wait_for_completion_interruptible_timeout return variable type
wait_for_completion_timeout_interruptible returns long not unsigned long so dma_time, which is used exclusively here, is changed to long. Fixes: 1b66e94e6b99 ("mmc: moxart: Add MOXA ART SD/MMC driver") Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc/host/moxart-mmc.c')
-rw-r--r--drivers/mmc/host/moxart-mmc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mmc/host/moxart-mmc.c b/drivers/mmc/host/moxart-mmc.c
index 79905ce895ad..bbad309679cf 100644
--- a/drivers/mmc/host/moxart-mmc.c
+++ b/drivers/mmc/host/moxart-mmc.c
@@ -257,7 +257,7 @@ static void moxart_dma_complete(void *param)
static void moxart_transfer_dma(struct mmc_data *data, struct moxart_host *host)
{
u32 len, dir_data, dir_slave;
- unsigned long dma_time;
+ long dma_time;
struct dma_async_tx_descriptor *desc = NULL;
struct dma_chan *dma_chan;
@@ -397,7 +397,8 @@ static void moxart_prepare_data(struct moxart_host *host)
static void moxart_request(struct mmc_host *mmc, struct mmc_request *mrq)
{
struct moxart_host *host = mmc_priv(mmc);
- unsigned long pio_time, flags;
+ long pio_time;
+ unsigned long flags;
u32 status;
spin_lock_irqsave(&host->lock, flags);