| commit | 2c9d9b6fa70e1881c411d45d2f3d2ab28bd58c75 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | Fri Dec 23 18:08:02 2011 +0000 |
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | Fri Dec 23 18:08:02 2011 +0000 |
| tree | a4db4fa7ace6e133e71ac1e4c9de81a6638461f2 | |
| parent | c5cf4dbc7f804bb4ff02a065b927bd8688204253 [diff] | |
| parent | 990fc3d0b2c27a9633b8f4566273da60aebe5941 [diff] |
Merge branch 'for-3.2' into for-3.3
diff --git a/sound/soc/codecs/wm8776.c b/sound/soc/codecs/wm8776.c index 38b4556..33e97d1 100644 --- a/sound/soc/codecs/wm8776.c +++ b/sound/soc/codecs/wm8776.c
@@ -234,6 +234,7 @@ switch (snd_pcm_format_width(params_format(params))) { case 16: iface = 0; + break; case 20: iface = 0x10; break;