diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-12-06 09:36:17 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-12-06 09:36:17 +0100 |
commit | 0e44e059588e1d91f3a1974d2ce3348864d1d799 (patch) | |
tree | 1161c2508bd9eeab010ebc40ef87860fd85a35fd /sound/soc/pxa/tosa.c | |
parent | 96886c4361f1ae3f6c775d7c9295e2d557101d0f (diff) | |
parent | e8a7e48bb248a1196484d3f8afa53bded2b24e71 (diff) |
Merge commit 'v2.6.37-rc4' into imx-for-2.6.38
Done to resolve merge conflict:
Conflicts:
arch/arm/mach-mx25/devices-imx25.h
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'sound/soc/pxa/tosa.c')
-rw-r--r-- | sound/soc/pxa/tosa.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c index 73d0edd8ded9..7b983f935454 100644 --- a/sound/soc/pxa/tosa.c +++ b/sound/soc/pxa/tosa.c @@ -81,8 +81,13 @@ static int tosa_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 */ tosa_ext_control(codec); + + mutex_unlock(&codec->mutex); + return 0; } |