diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-23 19:08:02 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-23 19:08:02 +0100 |
| commit | 2c9d9b6fa70e1881c411d45d2f3d2ab28bd58c75 (patch) | |
| tree | a4db4fa7ace6e133e71ac1e4c9de81a6638461f2 /sound/soc/codecs | |
| parent | ASoC: Add trivial pm_runtime usage to Samsung DAI drivers (diff) | |
| parent | ASoC: wm8776: add missing break in sample size switch (diff) | |
| download | linux-2c9d9b6fa70e1881c411d45d2f3d2ab28bd58c75.tar.xz linux-2c9d9b6fa70e1881c411d45d2f3d2ab28bd58c75.zip | |
Merge branch 'for-3.2' into for-3.3
Diffstat (limited to 'sound/soc/codecs')
| -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, switch (snd_pcm_format_width(params_format(params))) { case 16: iface = 0; + break; case 20: iface = 0x10; break; |