diff options
| author |   Uli Luckas <u.luckas@road-gmbh.de> | 2005-11-07 21:22:07 +0000 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2005-11-07 21:22:07 +0000 |
| commit | 896937ad5c8a1f7264b43b79c0bac2bd8d993ece (patch) | |
| tree | 0ef8a66fd172980f01dcf6bd08b293cd931d7e8b /drivers/mmc | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild (diff) | |
| download | linux-dev-896937ad5c8a1f7264b43b79c0bac2bd8d993ece.tar.xz linux-dev-896937ad5c8a1f7264b43b79c0bac2bd8d993ece.zip | |
[ARM] 3120/1: Fix MMC/SD card driver resume deadlock
Patch from Uli Luckas
This is a simplification of patch 3116/1 as sugested by Russell King.
Signed-off-by: Uli Luckas <u.luckas@road-gmbh.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
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; } |