diff options
author | Mark Brown <broonie@linaro.org> | 2013-09-27 14:56:21 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-09-27 14:56:21 +0100 |
commit | 57754df746ec2d0ce2ab5841f16136587789a5b6 (patch) | |
tree | bab109786db55175c481f04296ae8f6f954058db /sound/soc | |
parent | 92396e78d339e1ba8c50e69fee96197a56d3911a (diff) | |
parent | 4f8ec173775fc732075cce78bd2c30660259c14c (diff) | |
download | linux-57754df746ec2d0ce2ab5841f16136587789a5b6.tar.gz linux-57754df746ec2d0ce2ab5841f16136587789a5b6.tar.bz2 linux-57754df746ec2d0ce2ab5841f16136587789a5b6.zip |
Merge remote-tracking branch 'asoc/fix/bfin' into asoc-linus
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/blackfin/bf6xx-i2s.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/blackfin/bf6xx-i2s.c b/sound/soc/blackfin/bf6xx-i2s.c index c02405cc007d..5810a0603f2f 100644 --- a/sound/soc/blackfin/bf6xx-i2s.c +++ b/sound/soc/blackfin/bf6xx-i2s.c @@ -88,6 +88,7 @@ static int bfin_i2s_hw_params(struct snd_pcm_substream *substream, case SNDRV_PCM_FORMAT_S8: param.spctl |= 0x70; sport->wdsize = 1; + break; case SNDRV_PCM_FORMAT_S16_LE: param.spctl |= 0xf0; sport->wdsize = 2; |