From cc144e0ceeb2d89bb428280bf3ceafb2d8a202ae Mon Sep 17 00:00:00 2001 From: Alexander Shiyan Date: Sat, 6 Apr 2013 10:13:31 +0400 Subject: [PATCH] --- yaml --- r: 372798 b: refs/heads/master c: abd4190f0c820b7f118450b52bb95c0be3a441bd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/mxcmmc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a7c37b914853..2438a3f76b3f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0d3e3350d5871c53464be4c92d57198744247005 +refs/heads/master: abd4190f0c820b7f118450b52bb95c0be3a441bd diff --git a/trunk/drivers/mmc/host/mxcmmc.c b/trunk/drivers/mmc/host/mxcmmc.c index a72936eea6fa..28e527ebde75 100644 --- a/trunk/drivers/mmc/host/mxcmmc.c +++ b/trunk/drivers/mmc/host/mxcmmc.c @@ -1052,12 +1052,12 @@ static int mxcmci_probe(struct platform_device *pdev) goto out_free_irq; } - mmc_add_host(mmc); - init_timer(&host->watchdog); host->watchdog.function = &mxcmci_watchdog; host->watchdog.data = (unsigned long)mmc; + mmc_add_host(mmc); + return 0; out_free_irq: