diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-11-16 05:45:55 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-11-16 05:45:55 -0500 |
commit | abfe69dd2e313d0c8226ca4a12329e3d829cfd7c (patch) | |
tree | d4d4c2d4d7a3aa5284a061eb23b41986ccacedfd /sound/soc/blackfin | |
parent | d009f3deb788f7d06fe04c52eaf812b657a0ca68 (diff) | |
parent | a190f7867e1830a2d4c890c00b27465b863f5f59 (diff) |
Merge tag 'asoc-v3.13-4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.13
A few fixes in drivers, the i.MX and wm8962 fixes are for a pretty nasty
issues for users of those drivers if they run into them.
Diffstat (limited to 'sound/soc/blackfin')
-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; |