]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mmc: moxart: fix wait_for_completion_interruptible_timeout return variable type
authorNicholas Mc Guire <hofrat@osadl.org>
Mon, 25 Jul 2016 17:59:23 +0000 (19:59 +0200)
committerBen Hutchings <ben@decadent.org.uk>
Thu, 23 Feb 2017 03:54:04 +0000 (03:54 +0000)
commit 41f469cac2663a41a7b0c84cb94e8f7024385ae4 upstream.

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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/mmc/host/moxart-mmc.c

index 74924a04026ea58d53e72855ae94dbd181ea7dab..1e2321e3bbbd844ae9f12e7559c8e236fa817e5a 100644 (file)
@@ -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);