summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-11-20 15:20:30 +0000
committerMark Brown <broonie@linaro.org>2013-11-20 15:20:30 +0000
commitbdbe9c72f65fde0faa415c1a8fc8a555367c6e9e (patch)
tree90529bc606b2437faaadfaa2396cc12953d6e90c /sound
parentc33ef2c9ed870901cdadf367ffc4423b90257e5f (diff)
parentafed4dbe3a043dbd833a53b6b4951e155708afd2 (diff)
downloadlinux-bdbe9c72f65fde0faa415c1a8fc8a555367c6e9e.tar.gz
linux-bdbe9c72f65fde0faa415c1a8fc8a555367c6e9e.tar.bz2
linux-bdbe9c72f65fde0faa415c1a8fc8a555367c6e9e.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;