diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 22:32:52 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 22:32:52 +0100 |
| commit | 254ce8dc882f8d69e5d49ed4807c94a61976fb15 (patch) | |
| tree | e45883595406ab36051f30c3dd4f1aa919cea593 /drivers/mmc | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| parent | [ARM] 3120/1: Fix MMC/SD card driver resume deadlock (diff) | |
| download | linux-254ce8dc882f8d69e5d49ed4807c94a61976fb15.tar.xz linux-254ce8dc882f8d69e5d49ed4807c94a61976fb15.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/mmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index ceae379a4d4c..da528390acf8 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -1263,7 +1263,7 @@ EXPORT_SYMBOL(mmc_suspend_host); */ int mmc_resume_host(struct mmc_host *host) { - mmc_detect_change(host, 0); + mmc_rescan(host); return 0; } |