diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-23 13:08:02 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-23 13:08:02 -0500 |
| commit | 2c9d9b6fa70e1881c411d45d2f3d2ab28bd58c75 (patch) | |
| tree | a4db4fa7ace6e133e71ac1e4c9de81a6638461f2 | |
| parent | c5cf4dbc7f804bb4ff02a065b927bd8688204253 (diff) | |
| parent | 990fc3d0b2c27a9633b8f4566273da60aebe5941 (diff) | |
Merge branch 'for-3.2' into for-3.3
| -rw-r--r-- | sound/soc/codecs/wm8776.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8776.c b/sound/soc/codecs/wm8776.c index 38b455662195..33e97d1d8f46 100644 --- a/sound/soc/codecs/wm8776.c +++ b/sound/soc/codecs/wm8776.c | |||
| @@ -234,6 +234,7 @@ static int wm8776_hw_params(struct snd_pcm_substream *substream, | |||
| 234 | switch (snd_pcm_format_width(params_format(params))) { | 234 | switch (snd_pcm_format_width(params_format(params))) { |
| 235 | case 16: | 235 | case 16: |
| 236 | iface = 0; | 236 | iface = 0; |
| 237 | break; | ||
| 237 | case 20: | 238 | case 20: |
| 238 | iface = 0x10; | 239 | iface = 0x10; |
| 239 | break; | 240 | break; |