| commit | c986564b3115ebd24a907515ac0b7ca2bef794f9 | |
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | |
| Mon, 12 Mar 2012 16:31:50 +0000 (12 16:31 +0000) | ||
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | |
| Mon, 12 Mar 2012 18:12:09 +0000 (12 18:12 +0000) | ||
| tree | cae0cd0b3d16a800920e3ea579f61b54bfb93619 | treesnapshot (tar.gz zip) |
| parent | 80f48143ffde97c48c5e550e2fcd2c9f8e77e554 | commitdiff |
ASoC: wm8994: Prevent ABBA deadlock with CODEC and accdet mutexes
Currently we can the accdet mutex from within DAPM when updating the device
state which means we take accdet then the CODEC mutex but we also do the
locking the other way around when responding to the jackdet IRQ. Move all
the jackdet use of the CODEC mutex out of the accdet lock to avoid this.
Since all the DAPM interactions depend only on a single threaded IRQ this
is still serialised.
The locking improvements in 3.5 allow a better solution there.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Currently we can the accdet mutex from within DAPM when updating the device
state which means we take accdet then the CODEC mutex but we also do the
locking the other way around when responding to the jackdet IRQ. Move all
the jackdet use of the CODEC mutex out of the accdet lock to avoid this.
Since all the DAPM interactions depend only on a single threaded IRQ this
is still serialised.
The locking improvements in 3.5 allow a better solution there.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| sound/soc/codecs/wm8994.c | diffblobblamehistory |