diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-06 18:35:44 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-06 18:35:44 +0300 |
| commit | 989db2005c328300239da4df4d80b057f8509d3b (patch) | |
| tree | 1f6c9528148416b0074c72c983503098ebcbcc27 /sound/soc/pxa/corgi.c | |
| parent | c046fd4dd613b22b35379665a8f7656d17bde0b3 (diff) | |
| parent | 197ebd4053c42351e3737d83aebb33ed97ed2dd8 (diff) | |
| download | linux-989db2005c328300239da4df4d80b057f8509d3b.tar.xz | |
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'sound/soc/pxa/corgi.c')
| -rw-r--r-- | sound/soc/pxa/corgi.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c index 810633cc3b6d..85956ff8783e 100644 --- a/sound/soc/pxa/corgi.c +++ b/sound/soc/pxa/corgi.c @@ -102,8 +102,13 @@ static int corgi_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 */ corgi_ext_control(codec); + + mutex_unlock(&codec->mutex); + return 0; } |