diff options
| -rw-r--r-- | sound/soc/pxa/corgi.c | 4 | ||||
| -rw-r--r-- | sound/soc/pxa/magician.c | 4 | ||||
| -rw-r--r-- | sound/soc/pxa/poodle.c | 4 | ||||
| -rw-r--r-- | sound/soc/pxa/spitz.c | 4 | ||||
| -rw-r--r-- | sound/soc/pxa/tosa.c | 4 |
5 files changed, 0 insertions, 20 deletions
diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c index 1853d41034bf..b51f88002e62 100644 --- a/sound/soc/pxa/corgi.c +++ b/sound/soc/pxa/corgi.c | |||
| @@ -99,13 +99,9 @@ static int corgi_startup(struct snd_pcm_substream *substream) | |||
| 99 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 99 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
| 100 | struct snd_soc_codec *codec = rtd->codec; | 100 | struct snd_soc_codec *codec = rtd->codec; |
| 101 | 101 | ||
| 102 | mutex_lock(&codec->mutex); | ||
| 103 | |||
| 104 | /* check the jack status at stream startup */ | 102 | /* check the jack status at stream startup */ |
| 105 | corgi_ext_control(&codec->dapm); | 103 | corgi_ext_control(&codec->dapm); |
| 106 | 104 | ||
| 107 | mutex_unlock(&codec->mutex); | ||
| 108 | |||
| 109 | return 0; | 105 | return 0; |
| 110 | } | 106 | } |
| 111 | 107 | ||
diff --git a/sound/soc/pxa/magician.c b/sound/soc/pxa/magician.c index aace19e0fe2c..aeb08f5f3e1c 100644 --- a/sound/soc/pxa/magician.c +++ b/sound/soc/pxa/magician.c | |||
| @@ -73,13 +73,9 @@ static int magician_startup(struct snd_pcm_substream *substream) | |||
| 73 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 73 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
| 74 | struct snd_soc_codec *codec = rtd->codec; | 74 | struct snd_soc_codec *codec = rtd->codec; |
| 75 | 75 | ||
| 76 | mutex_lock(&codec->mutex); | ||
| 77 | |||
| 78 | /* check the jack status at stream startup */ | 76 | /* check the jack status at stream startup */ |
| 79 | magician_ext_control(codec); | 77 | magician_ext_control(codec); |
| 80 | 78 | ||
| 81 | mutex_unlock(&codec->mutex); | ||
| 82 | |||
| 83 | return 0; | 79 | return 0; |
| 84 | } | 80 | } |
| 85 | 81 | ||
diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c index c93e138d8dc3..27c6c03bc5d7 100644 --- a/sound/soc/pxa/poodle.c +++ b/sound/soc/pxa/poodle.c | |||
| @@ -76,13 +76,9 @@ static int poodle_startup(struct snd_pcm_substream *substream) | |||
| 76 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 76 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
| 77 | struct snd_soc_codec *codec = rtd->codec; | 77 | struct snd_soc_codec *codec = rtd->codec; |
| 78 | 78 | ||
| 79 | mutex_lock(&codec->mutex); | ||
| 80 | |||
| 81 | /* check the jack status at stream startup */ | 79 | /* check the jack status at stream startup */ |
| 82 | poodle_ext_control(&codec->dapm); | 80 | poodle_ext_control(&codec->dapm); |
| 83 | 81 | ||
| 84 | mutex_unlock(&codec->mutex); | ||
| 85 | |||
| 86 | return 0; | 82 | return 0; |
| 87 | } | 83 | } |
| 88 | 84 | ||
diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c index fc052d8247ff..0728c1eb780c 100644 --- a/sound/soc/pxa/spitz.c +++ b/sound/soc/pxa/spitz.c | |||
| @@ -108,13 +108,9 @@ static int spitz_startup(struct snd_pcm_substream *substream) | |||
| 108 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 108 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
| 109 | struct snd_soc_codec *codec = rtd->codec; | 109 | struct snd_soc_codec *codec = rtd->codec; |
| 110 | 110 | ||
| 111 | mutex_lock(&codec->mutex); | ||
| 112 | |||
| 113 | /* check the jack status at stream startup */ | 111 | /* check the jack status at stream startup */ |
| 114 | spitz_ext_control(&codec->dapm); | 112 | spitz_ext_control(&codec->dapm); |
| 115 | 113 | ||
| 116 | mutex_unlock(&codec->mutex); | ||
| 117 | |||
| 118 | return 0; | 114 | return 0; |
| 119 | } | 115 | } |
| 120 | 116 | ||
diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c index 1d9c2ed223bc..d6f38d7ecc1c 100644 --- a/sound/soc/pxa/tosa.c +++ b/sound/soc/pxa/tosa.c | |||
| @@ -80,13 +80,9 @@ static int tosa_startup(struct snd_pcm_substream *substream) | |||
| 80 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 80 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
| 81 | struct snd_soc_codec *codec = rtd->codec; | 81 | struct snd_soc_codec *codec = rtd->codec; |
| 82 | 82 | ||
| 83 | mutex_lock(&codec->mutex); | ||
| 84 | |||
| 85 | /* check the jack status at stream startup */ | 83 | /* check the jack status at stream startup */ |
| 86 | tosa_ext_control(codec); | 84 | tosa_ext_control(codec); |
| 87 | 85 | ||
| 88 | mutex_unlock(&codec->mutex); | ||
| 89 | |||
| 90 | return 0; | 86 | return 0; |
| 91 | } | 87 | } |
| 92 | 88 | ||
