diff options
author | Mark Brown <broonie@kernel.org> | 2015-04-12 14:48:27 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-04-12 14:48:27 -0400 |
commit | 3eaecb4b50693378bb55cc633992e7f72be35687 (patch) | |
tree | 486306b254d3e0738d9f9e8e8958cd594f8f65d7 | |
parent | 250acc709ee23856eba8432f979e42ba64a9a8b6 (diff) | |
parent | 8787041d9bb832b9449b1eb878cedcebce42c61a (diff) |
Merge remote-tracking branch 'asoc/fix/wm8741' into asoc-linus
-rw-r--r-- | sound/soc/codecs/wm8741.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8741.c b/sound/soc/codecs/wm8741.c index 31bb4801a005..9e71c768966f 100644 --- a/sound/soc/codecs/wm8741.c +++ b/sound/soc/codecs/wm8741.c | |||
@@ -123,7 +123,7 @@ static struct { | |||
123 | }; | 123 | }; |
124 | 124 | ||
125 | static const unsigned int rates_11289[] = { | 125 | static const unsigned int rates_11289[] = { |
126 | 44100, 88235, | 126 | 44100, 88200, |
127 | }; | 127 | }; |
128 | 128 | ||
129 | static const struct snd_pcm_hw_constraint_list constraints_11289 = { | 129 | static const struct snd_pcm_hw_constraint_list constraints_11289 = { |
@@ -150,7 +150,7 @@ static const struct snd_pcm_hw_constraint_list constraints_16384 = { | |||
150 | }; | 150 | }; |
151 | 151 | ||
152 | static const unsigned int rates_16934[] = { | 152 | static const unsigned int rates_16934[] = { |
153 | 44100, 88235, | 153 | 44100, 88200, |
154 | }; | 154 | }; |
155 | 155 | ||
156 | static const struct snd_pcm_hw_constraint_list constraints_16934 = { | 156 | static const struct snd_pcm_hw_constraint_list constraints_16934 = { |
@@ -168,7 +168,7 @@ static const struct snd_pcm_hw_constraint_list constraints_18432 = { | |||
168 | }; | 168 | }; |
169 | 169 | ||
170 | static const unsigned int rates_22579[] = { | 170 | static const unsigned int rates_22579[] = { |
171 | 44100, 88235, 1764000 | 171 | 44100, 88200, 176400 |
172 | }; | 172 | }; |
173 | 173 | ||
174 | static const struct snd_pcm_hw_constraint_list constraints_22579 = { | 174 | static const struct snd_pcm_hw_constraint_list constraints_22579 = { |
@@ -186,7 +186,7 @@ static const struct snd_pcm_hw_constraint_list constraints_24576 = { | |||
186 | }; | 186 | }; |
187 | 187 | ||
188 | static const unsigned int rates_36864[] = { | 188 | static const unsigned int rates_36864[] = { |
189 | 48000, 96000, 19200 | 189 | 48000, 96000, 192000 |
190 | }; | 190 | }; |
191 | 191 | ||
192 | static const struct snd_pcm_hw_constraint_list constraints_36864 = { | 192 | static const struct snd_pcm_hw_constraint_list constraints_36864 = { |