git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
[pandora-kernel.git]
/
drivers
/
mmc
/
host
/
sh_mmcif.c
diff --git
a/drivers/mmc/host/sh_mmcif.c
b/drivers/mmc/host/sh_mmcif.c
index
369366c
..
d5505f3
100644
(file)
--- a/
drivers/mmc/host/sh_mmcif.c
+++ b/
drivers/mmc/host/sh_mmcif.c
@@
-908,7
+908,7
@@
static void sh_mmcif_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
if (host->power) {
pm_runtime_put(&host->pd->dev);
host->power = false;
if (host->power) {
pm_runtime_put(&host->pd->dev);
host->power = false;
- if (p->down_pwr)
+ if (p->down_pwr
&& ios->power_mode == MMC_POWER_OFF
)
p->down_pwr(host->pd);
}
host->state = STATE_IDLE;
p->down_pwr(host->pd);
}
host->state = STATE_IDLE;