diff options
| author | Anton Altaparmakov <aia21@hera.kernel.org> | 2005-09-09 11:19:10 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@hera.kernel.org> | 2005-09-09 11:19:10 -0400 |
| commit | ddcc95963449d028b16d9b9fe50f6e91ce7d9e81 (patch) | |
| tree | aaf0392346a18b3e232ddeb5db3c4e917f7ca686 /drivers/mmc/mmci.c | |
| parent | 223176bc722a7bf519904180e956292ae1d1e819 (diff) | |
| parent | 5f5024130287a9467a41b9f94ec170958ae45cbd (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/mmc/mmci.c')
| -rw-r--r-- | drivers/mmc/mmci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/mmci.c b/drivers/mmc/mmci.c index 716c4ef4faf6..91c74843dc0d 100644 --- a/drivers/mmc/mmci.c +++ b/drivers/mmc/mmci.c | |||
| @@ -442,7 +442,7 @@ static void mmci_check_status(unsigned long data) | |||
| 442 | 442 | ||
| 443 | status = host->plat->status(mmc_dev(host->mmc)); | 443 | status = host->plat->status(mmc_dev(host->mmc)); |
| 444 | if (status ^ host->oldstat) | 444 | if (status ^ host->oldstat) |
| 445 | mmc_detect_change(host->mmc); | 445 | mmc_detect_change(host->mmc, 0); |
| 446 | 446 | ||
| 447 | host->oldstat = status; | 447 | host->oldstat = status; |
| 448 | mod_timer(&host->timer, jiffies + HZ); | 448 | mod_timer(&host->timer, jiffies + HZ); |