diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-06 16:35:44 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-06 16:35:44 +0100 |
| commit | 989db2005c328300239da4df4d80b057f8509d3b (patch) | |
| tree | 1f6c9528148416b0074c72c983503098ebcbcc27 /sound/soc/pxa/magician.c | |
| parent | ASoC: WM8770: Initial driver (diff) | |
| parent | ASoC: WM8776: Removed unneeded struct member (diff) | |
| download | linux-989db2005c328300239da4df4d80b057f8509d3b.tar.xz linux-989db2005c328300239da4df4d80b057f8509d3b.zip | |
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'sound/soc/pxa/magician.c')
| -rw-r--r-- | sound/soc/pxa/magician.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/pxa/magician.c b/sound/soc/pxa/magician.c index f1acdc57cfd8..98cb9906e795 100644 --- a/sound/soc/pxa/magician.c +++ b/sound/soc/pxa/magician.c @@ -74,9 +74,13 @@ static int magician_startup(struct snd_pcm_substream *substream) struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_codec *codec = rtd->codec; + mutex_lock(&codec->mutex); + /* check the jack status at stream startup */ magician_ext_control(codec); + mutex_unlock(&codec->mutex); + return 0; } |