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 branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
drivers
/
mmc
/
core
/
sdio_bus.c
diff --git
a/drivers/mmc/core/sdio_bus.c
b/drivers/mmc/core/sdio_bus.c
index
d29b9c3
..
d2565df
100644
(file)
--- a/
drivers/mmc/core/sdio_bus.c
+++ b/
drivers/mmc/core/sdio_bus.c
@@
-189,7
+189,7
@@
static int sdio_bus_remove(struct device *dev)
/* Then undo the runtime PM settings in sdio_bus_probe() */
if (func->card->host->caps & MMC_CAP_POWER_OFF_CARD)
- pm_runtime_put_
noidle
(dev);
+ pm_runtime_put_
sync
(dev);
out:
return ret;