diff options
| author | Chris Ball <cjb@laptop.org> | 2011-05-16 11:32:26 -0400 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2011-05-16 11:32:26 -0400 |
| commit | 86f315bbb2374f1f077500ad131dd9b71856e697 (patch) | |
| tree | d1e70a9bfaa1665bef1b085f6f8ce4a0498e90d2 /include | |
| parent | eed631e0d741d1a1067cfc6d709fdf2363126f9c (diff) | |
Revert "mmc: fix a race between card-detect rescan and clock-gate work instances"
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>
Cc: <stable@kernel.org>
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 eb792cb6d745..bcb793ec7374 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h | |||
| @@ -183,6 +183,7 @@ struct mmc_host { | |||
| 183 | struct work_struct clk_gate_work; /* delayed clock gate */ | 183 | struct work_struct clk_gate_work; /* delayed clock gate */ |
| 184 | unsigned int clk_old; /* old clock value cache */ | 184 | unsigned int clk_old; /* old clock value cache */ |
| 185 | spinlock_t clk_lock; /* lock for clk fields */ | 185 | spinlock_t clk_lock; /* lock for clk fields */ |
| 186 | struct mutex clk_gate_mutex; /* mutex for clock gating */ | ||
| 186 | #endif | 187 | #endif |
| 187 | 188 | ||
| 188 | /* host specific block data */ | 189 | /* host specific block data */ |