| commit | bdbe9c72f65fde0faa415c1a8fc8a555367c6e9e | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@linaro.org> | Wed Nov 20 15:20:30 2013 +0000 |
| committer | Mark Brown <broonie@linaro.org> | Wed Nov 20 15:20:30 2013 +0000 |
| tree | 90529bc606b2437faaadfaa2396cc12953d6e90c | |
| parent | c33ef2c9ed870901cdadf367ffc4423b90257e5f [diff] | |
| parent | afed4dbe3a043dbd833a53b6b4951e155708afd2 [diff] |
Merge remote-tracking branch 'asoc/fix/blackfin' into asoc-linus
diff --git a/sound/soc/blackfin/bf5xx-i2s.c b/sound/soc/blackfin/bf5xx-i2s.c index 9a174fc..39d7748 100644 --- a/sound/soc/blackfin/bf5xx-i2s.c +++ b/sound/soc/blackfin/bf5xx-i2s.c
@@ -121,6 +121,7 @@ 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;