diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-20 10:20:30 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-20 10:20:30 -0500 |
| commit | bdbe9c72f65fde0faa415c1a8fc8a555367c6e9e (patch) | |
| tree | 90529bc606b2437faaadfaa2396cc12953d6e90c | |
| parent | c33ef2c9ed870901cdadf367ffc4423b90257e5f (diff) | |
| parent | afed4dbe3a043dbd833a53b6b4951e155708afd2 (diff) | |
Merge remote-tracking branch 'asoc/fix/blackfin' into asoc-linus
| -rw-r--r-- | sound/soc/blackfin/bf5xx-i2s.c | 1 |
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, | |||
| 121 | bf5xx_i2s->tcr2 |= 7; | 121 | bf5xx_i2s->tcr2 |= 7; |
| 122 | bf5xx_i2s->rcr2 |= 7; | 122 | bf5xx_i2s->rcr2 |= 7; |
| 123 | sport_handle->wdsize = 1; | 123 | sport_handle->wdsize = 1; |
| 124 | break; | ||
| 124 | case SNDRV_PCM_FORMAT_S16_LE: | 125 | case SNDRV_PCM_FORMAT_S16_LE: |
| 125 | bf5xx_i2s->tcr2 |= 15; | 126 | bf5xx_i2s->tcr2 |= 15; |
| 126 | bf5xx_i2s->rcr2 |= 15; | 127 | bf5xx_i2s->rcr2 |= 15; |