projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mmc-updates-for-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-block.git]
/
drivers
/
mmc
/
core
/
bus.c
diff --git
a/drivers/mmc/core/bus.c
b/drivers/mmc/core/bus.c
index d4b99bbe0781137c43c6758e630c26f4d3503a36..704bf66f58733a036bf79bfc4ef585f29acb7626 100644
(file)
--- a/
drivers/mmc/core/bus.c
+++ b/
drivers/mmc/core/bus.c
@@
-205,7
+205,7
@@
static int mmc_runtime_resume(struct device *dev)
static int mmc_runtime_idle(struct device *dev)
{
- return
pm_runtime_suspend(dev)
;
+ return
0
;
}
#endif /* !CONFIG_PM_RUNTIME */