diff options
-rw-r--r-- | sound/soc/codecs/wm8776.c | 1 | ||||
-rw-r--r-- | sound/soc/pxa/corgi.c | 5 | ||||
-rw-r--r-- | sound/soc/pxa/magician.c | 4 | ||||
-rw-r--r-- | sound/soc/pxa/poodle.c | 5 | ||||
-rw-r--r-- | sound/soc/pxa/spitz.c | 5 | ||||
-rw-r--r-- | sound/soc/pxa/tosa.c | 5 |
6 files changed, 24 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8776.c b/sound/soc/codecs/wm8776.c index 96474a40da8d..e09ed65e0868 100644 --- a/sound/soc/codecs/wm8776.c +++ b/sound/soc/codecs/wm8776.c | |||
@@ -34,7 +34,6 @@ | |||
34 | /* codec private data */ | 34 | /* codec private data */ |
35 | struct wm8776_priv { | 35 | struct wm8776_priv { |
36 | enum snd_soc_control_type control_type; | 36 | enum snd_soc_control_type control_type; |
37 | u16 reg_cache[WM8776_CACHEREGNUM]; | ||
38 | int sysclk[2]; | 37 | int sysclk[2]; |
39 | }; | 38 | }; |
40 | 39 | ||
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) | |||
102 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 102 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
103 | struct snd_soc_codec *codec = rtd->codec; | 103 | struct snd_soc_codec *codec = rtd->codec; |
104 | 104 | ||
105 | mutex_lock(&codec->mutex); | ||
106 | |||
105 | /* check the jack status at stream startup */ | 107 | /* check the jack status at stream startup */ |
106 | corgi_ext_control(codec); | 108 | corgi_ext_control(codec); |
109 | |||
110 | mutex_unlock(&codec->mutex); | ||
111 | |||
107 | return 0; | 112 | return 0; |
108 | } | 113 | } |
109 | 114 | ||
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) | |||
74 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 74 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
75 | struct snd_soc_codec *codec = rtd->codec; | 75 | struct snd_soc_codec *codec = rtd->codec; |
76 | 76 | ||
77 | mutex_lock(&codec->mutex); | ||
78 | |||
77 | /* check the jack status at stream startup */ | 79 | /* check the jack status at stream startup */ |
78 | magician_ext_control(codec); | 80 | magician_ext_control(codec); |
79 | 81 | ||
82 | mutex_unlock(&codec->mutex); | ||
83 | |||
80 | return 0; | 84 | return 0; |
81 | } | 85 | } |
82 | 86 | ||
diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c index 7353ee5034fe..f45ea408852b 100644 --- a/sound/soc/pxa/poodle.c +++ b/sound/soc/pxa/poodle.c | |||
@@ -79,8 +79,13 @@ static int poodle_startup(struct snd_pcm_substream *substream) | |||
79 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 79 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
80 | struct snd_soc_codec *codec = rtd->codec; | 80 | struct snd_soc_codec *codec = rtd->codec; |
81 | 81 | ||
82 | mutex_lock(&codec->mutex); | ||
83 | |||
82 | /* check the jack status at stream startup */ | 84 | /* check the jack status at stream startup */ |
83 | poodle_ext_control(codec); | 85 | poodle_ext_control(codec); |
86 | |||
87 | mutex_unlock(&codec->mutex); | ||
88 | |||
84 | return 0; | 89 | return 0; |
85 | } | 90 | } |
86 | 91 | ||
diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c index 0680b11c2685..7e13440cca41 100644 --- a/sound/soc/pxa/spitz.c +++ b/sound/soc/pxa/spitz.c | |||
@@ -110,8 +110,13 @@ static int spitz_startup(struct snd_pcm_substream *substream) | |||
110 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 110 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
111 | struct snd_soc_codec *codec = rtd->codec; | 111 | struct snd_soc_codec *codec = rtd->codec; |
112 | 112 | ||
113 | mutex_lock(&codec->mutex); | ||
114 | |||
113 | /* check the jack status at stream startup */ | 115 | /* check the jack status at stream startup */ |
114 | spitz_ext_control(codec); | 116 | spitz_ext_control(codec); |
117 | |||
118 | mutex_unlock(&codec->mutex); | ||
119 | |||
115 | return 0; | 120 | return 0; |
116 | } | 121 | } |
117 | 122 | ||
diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c index 0a9bd68ef749..7f81f82ba788 100644 --- a/sound/soc/pxa/tosa.c +++ b/sound/soc/pxa/tosa.c | |||
@@ -83,8 +83,13 @@ static int tosa_startup(struct snd_pcm_substream *substream) | |||
83 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 83 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
84 | struct snd_soc_codec *codec = rtd->codec; | 84 | struct snd_soc_codec *codec = rtd->codec; |
85 | 85 | ||
86 | mutex_lock(&codec->mutex); | ||
87 | |||
86 | /* check the jack status at stream startup */ | 88 | /* check the jack status at stream startup */ |
87 | tosa_ext_control(codec); | 89 | tosa_ext_control(codec); |
90 | |||
91 | mutex_unlock(&codec->mutex); | ||
92 | |||
88 | return 0; | 93 | return 0; |
89 | } | 94 | } |
90 | 95 | ||