summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-11-15 10:20:07 +0000
committerMark Brown <broonie@linaro.org>2013-11-15 10:20:07 +0000
commit7e4da109b40c4d42af7bb6862b6659dafb5fe899 (patch)
treebc32f84bee30f408b255f8dfb29480ca416c4b2a /sound
parent092d40505202ebc9fdfa5582f469458c7dd62257 (diff)
parentafed4dbe3a043dbd833a53b6b4951e155708afd2 (diff)
downloadlinux-7e4da109b40c4d42af7bb6862b6659dafb5fe899.tar.gz
linux-7e4da109b40c4d42af7bb6862b6659dafb5fe899.tar.bz2
linux-7e4da109b40c4d42af7bb6862b6659dafb5fe899.zip
Merge remote-tracking branch 'asoc/fix/blackfin' into asoc-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/blackfin/bf5xx-i2s.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/blackfin/bf5xx-i2s.c b/sound/soc/blackfin/bf5xx-i2s.c
index 9a174fc47d39..39d774839b3e 100644
--- a/sound/soc/blackfin/bf5xx-i2s.c
+++ b/sound/soc/blackfin/bf5xx-i2s.c
@@ -121,6 +121,7 @@ static int bf5xx_i2s_hw_params(struct snd_pcm_substream *substream,
bf5xx_i2s->tcr2 |= 7;
bf5xx_i2s->rcr2 |= 7;
sport_handle->wdsize = 1;
+ break;
case SNDRV_PCM_FORMAT_S16_LE:
bf5xx_i2s->tcr2 |= 15;
bf5xx_i2s->rcr2 |= 15;