Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a04ac5b9 authored by Wolfgang Muees's avatar Wolfgang Muees Committed by Linus Torvalds
Browse files

mmc: at91_mci: fix timeout errors 



Fix two timeout errors, one for slow SDHC cards and one for slow users
while inserting SD cards.

Signed-off-by: default avatarWolfgang Muees <wolfgang.mues@auerswald.de>
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Cc: Andrew Victor <avictor.za@gmail.com>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0b3520f2

drivers/mmc/host/at91_mci.c

+4 −2
Original line number Diff line number Diff line
@@ -756,7 +756,8 @@ static void at91_mci_request(struct mmc_host *mmc, struct mmc_request *mrq) 
	host->request = mrq;

	host->flags = 0;



	mod_timer(&host->timer, jiffies +  HZ);

	/* more than 1s timeout needed with slow SD cards */

	mod_timer(&host->timer, jiffies +  msecs_to_jiffies(2000));



	at91_mci_process_next(host);

}
@@ -944,7 +945,8 @@ static irqreturn_t at91_mmc_det_irq(int irq, void *_host) 
			pr_debug("****** Resetting SD-card bus width ******\n");

			at91_mci_write(host, AT91_MCI_SDCR, at91_mci_read(host, AT91_MCI_SDCR) & ~AT91_MCI_SDCBUS);

		}

		mmc_detect_change(host->mmc, msecs_to_jiffies(100));

		/* 0.5s needed because of early card detect switch firing */

		mmc_detect_change(host->mmc, msecs_to_jiffies(500));

	}

	return IRQ_HANDLED;

}