Skip to content

Commit abd4190

Browse files
shcgitcjb
authored andcommitted
mmc: mxcmmc: Fix bug when card is present during boot
This patch fixes bug when card is present during boot. Bug was introduced due commit "mmc: mxcmmc: fix bug that may block a data transfer forever". When a card is present "mxcmci_setup_data" function is executed, but the timer is not initialized. ... i.MX SDHC driver mmc0: SD Status: Invalid Allocation Unit size. mmc0: new SD card at address b368 mmcblk0: mmc0:b368 SDC 1.91 GiB ------------[ cut here ]------------ kernel BUG at kernel/timer.c:729! Internal error: Oops - BUG: 0 [#1] PREEMPT ARM CPU: 0 Not tainted (3.9.0-rc5-next-20130404 #2) PC is at mod_timer+0x168/0x198 LR is at mxcmci_request+0x21c/0x328 ... Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Chris Ball <cjb@laptop.org>
1 parent 0d3e335 commit abd4190

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/mmc/host/mxcmmc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,12 +1052,12 @@ static int mxcmci_probe(struct platform_device *pdev)
10521052
goto out_free_irq;
10531053
}
10541054

1055-
mmc_add_host(mmc);
1056-
10571055
init_timer(&host->watchdog);
10581056
host->watchdog.function = &mxcmci_watchdog;
10591057
host->watchdog.data = (unsigned long)mmc;
10601058

1059+
mmc_add_host(mmc);
1060+
10611061
return 0;
10621062

10631063
out_free_irq:

0 commit comments

Comments
 (0)