diff options
author | Chris Ball <cjb@laptop.org> | 2011-05-16 11:32:26 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-21 15:13:26 -0700 |
commit | 758b8cc02fae512d6748a87d1c8656a94b1fecaa (patch) | |
tree | ca6a5aa0847580323d2e21993b8e2ad8d045ba5e /include | |
parent | 75059cf1749d3e92a5119789ff33f951fbbd1c31 (diff) |
Revert "mmc: fix a race between card-detect rescan and clock-gate work instances"
commit 86f315bbb2374f1f077500ad131dd9b71856e697 upstream.
This reverts commit 26fc8775b51484d8c0a671198639c6d5ae60533e, which has
been reported to cause boot/resume-time crashes for some users:
https://bbs.archlinux.org/viewtopic.php?id=118751.
Signed-off-by: Chris Ball <cjb@laptop.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/mmc/host.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index eb792cb6d74..bcb793ec737 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -183,6 +183,7 @@ struct mmc_host { struct work_struct clk_gate_work; /* delayed clock gate */ unsigned int clk_old; /* old clock value cache */ spinlock_t clk_lock; /* lock for clk fields */ + struct mutex clk_gate_mutex; /* mutex for clock gating */ #endif /* host specific block data */ |