diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2010-10-14 15:20:21 -0700 |
|---|---|---|
| committer | Kyle Yan <kyan@codeaurora.org> | 2016-06-15 16:11:05 -0700 |
| commit | f88fc3eaa627b9f8f39752c8c6a8f49655afccb6 (patch) | |
| tree | 10a5df9e37649951048ad98457ba88174f6d82b2 /include/linux | |
| parent | 7eac9a6d8569875f5dc2757a6873bb9bd6f496e8 (diff) | |
mmc: Fix pm_notifier obeying deferred resume
Do not resume if deferred resume is enabled.
Only resume when a request is received.
Change-Id: I1eae7dffec97d34b066bb5738c84a7e5a82f68d7
Git-commit: ac9ac6f26904c94e8aec47cab6936dd241c2eb66
Git-repo: git://git-android.quicinc.com/kernel/msm-3.10
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
[asutoshd@codeaurora.org: merge conflicts resolved]
Signed-off-by: Asutosh Das <asutoshd@codeaurora.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mmc/host.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index 4e81196c3903..5cfed430b8d4 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -620,6 +620,8 @@ static inline void *mmc_cmdq_private(struct mmc_host *host) #define mmc_hostname(x) (dev_name(&(x)->class_dev)) #define mmc_bus_needs_resume(host) ((host)->bus_resume_flags & \ MMC_BUSRESUME_NEEDS_RESUME) +#define mmc_bus_manual_resume(host) ((host)->bus_resume_flags & \ + MMC_BUSRESUME_MANUAL_RESUME) static inline void mmc_set_bus_resume_policy(struct mmc_host *host, int manual) { |