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

Commit b87cc1b5 authored by Ludovic Desroches's avatar Ludovic Desroches Committed by Chris Ball
Browse files

mmc: atmel-mci: fix data timeout issue 



The data timeout timer was configured after mmc_add_host call. So, with bad
timings, it was possible to have a mmc request causing mod_timer call on a
non setup timer.

Signed-off-by: default avatarLudovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 09eeff52

drivers/mmc/host/atmel-mci.c

+2 −2
Original line number Diff line number Diff line
@@ -2314,6 +2314,8 @@ static int __init atmci_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, host);



	setup_timer(&host->timer, atmci_timeout_timer, (unsigned long)host);



	/* We need at least one slot to succeed */

	nr_slots = 0;

	ret = -ENODEV;
@@ -2352,8 +2354,6 @@ static int __init atmci_probe(struct platform_device *pdev) 
		}

	}



	setup_timer(&host->timer, atmci_timeout_timer, (unsigned long)host);



	dev_info(&pdev->dev,

			"Atmel MCI controller at 0x%08lx irq %d, %u slots\n",

			host->mapbase, irq, nr_slots);