aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2011-09-07 17:28:58 -0700
committerColin Cross <ccross@android.com>2011-09-07 17:30:23 -0700
commit07b26cd3da54bf9ff3723805e19bcc2dffb48297 (patch)
tree0de8b79730fe1b6a6c1f23e21fe1f790aeff8042 /include
parent686d33a258c7f7e8c86ee55c1d7155f3586d1f55 (diff)
downloadkernel_samsung_crespo-07b26cd3da54bf9ff3723805e19bcc2dffb48297.zip
kernel_samsung_crespo-07b26cd3da54bf9ff3723805e19bcc2dffb48297.tar.gz
kernel_samsung_crespo-07b26cd3da54bf9ff3723805e19bcc2dffb48297.tar.bz2
mmc: core: host: only use wakelock for detect work
There is no need to take a wakelock for delayed lazy disable work, it will be cancelled in the suspend handler and force disabled. Only take the wakelock when the detect work is queued, and make sure to drop the wakelock if the work is cancelled. Change-Id: I1e507a5f98848954ea21d45e23b6192c3132a349 Signed-off-by: Colin Cross <ccross@android.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/mmc/host.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index 1584b52..2cfa8d0 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -12,6 +12,7 @@
#include <linux/leds.h>
#include <linux/sched.h>
+#include <linux/wakelock.h>
#include <linux/mmc/core.h>
#include <linux/mmc/pm.h>
@@ -261,6 +262,7 @@ struct mmc_host {
int claim_cnt; /* "claim" nesting count */
struct delayed_work detect;
+ struct wake_lock detect_wake_lock;
const struct mmc_bus_ops *bus_ops; /* current bus driver */
unsigned int bus_refs; /* reference counter */