diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-09-24 14:03:37 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-09-24 14:03:37 +0200 |
| commit | 73e6d6c6467771838c1fc6949e6768a12ed72464 (patch) | |
| tree | 94dd60891869a0a275cd332c4e675cf0b101fcfa /drivers/mmc/host/imxmmc.c | |
| parent | 12e5272585901217e919da810c801e5084ee0cb1 (diff) | |
| parent | a850ea30374ebed32a0724742601861853fde869 (diff) | |
| download | kernel_replicant_linux-73e6d6c6467771838c1fc6949e6768a12ed72464.tar.gz kernel_replicant_linux-73e6d6c6467771838c1fc6949e6768a12ed72464.tar.bz2 kernel_replicant_linux-73e6d6c6467771838c1fc6949e6768a12ed72464.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/mmc/host/imxmmc.c')
| -rw-r--r-- | drivers/mmc/host/imxmmc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mmc/host/imxmmc.c b/drivers/mmc/host/imxmmc.c index 9a68ff4353a2..5a950b16d9e6 100644 --- a/drivers/mmc/host/imxmmc.c +++ b/drivers/mmc/host/imxmmc.c @@ -148,11 +148,12 @@ static int imxmci_start_clock(struct imxmci_host *host) while (delay--) { reg = readw(host->base + MMC_REG_STATUS); - if (reg & STATUS_CARD_BUS_CLK_RUN) + if (reg & STATUS_CARD_BUS_CLK_RUN) { /* Check twice before cut */ reg = readw(host->base + MMC_REG_STATUS); if (reg & STATUS_CARD_BUS_CLK_RUN) return 0; + } if (test_bit(IMXMCI_PEND_STARTED_b, &host->pending_events)) return 0; |