aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-06-22 12:21:17 -0400
committerLuis Henriques <luis.henriques@canonical.com>2012-08-13 09:10:40 -0400
commit4fe8d067d3948e40f6f0c6adfa92b2bdc8d7bd01 (patch)
tree2ce5a61b4d2f19800dc5a825ebdd294c8de78dbb /sound/soc/codecs
parent3170705e2a74fe4f052157e8ccf152fba378cc62 (diff)
ASoC: wm8994: Ensure there are enough BCLKs for four channels
BugLink: http://bugs.launchpad.net/bugs/1034988 commit b8edf3e5522735c8ce78b81845f7a1a2d4a08626 upstream. Otherwise if someone tries to use all four channels on AIF1 with the device in master mode we won't be able to clock out all the data. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r--sound/soc/codecs/wm8994.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 21949123787..1f7616d03ff 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -2127,7 +2127,7 @@ static int wm8994_hw_params(struct snd_pcm_substream *substream,
2127 return -EINVAL; 2127 return -EINVAL;
2128 } 2128 }
2129 2129
2130 bclk_rate = params_rate(params) * 2; 2130 bclk_rate = params_rate(params) * 4;
2131 switch (params_format(params)) { 2131 switch (params_format(params)) {
2132 case SNDRV_PCM_FORMAT_S16_LE: 2132 case SNDRV_PCM_FORMAT_S16_LE:
2133 bclk_rate *= 16; 2133 bclk_rate *= 16;