summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-06-22 17:21:17 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-08-09 08:31:52 -0700
commit8f32469c980654a17e935dae06a3557b488910a4 (patch)
treee4b99ec54055ad7763d188e2bdc8a7b7700093d7 /sound
parent9966af8a7ac83cdc9aa5a054e843fdecc6689aa0 (diff)
downloadlinux-3.10-8f32469c980654a17e935dae06a3557b488910a4.tar.gz
linux-3.10-8f32469c980654a17e935dae06a3557b488910a4.tar.bz2
linux-3.10-8f32469c980654a17e935dae06a3557b488910a4.zip
ASoC: wm8994: Ensure there are enough BCLKs for four channels
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>
Diffstat (limited to 'sound')
-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 f351b933f5c..4c471a54893 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -2695,7 +2695,7 @@ static int wm8994_hw_params(struct snd_pcm_substream *substream,
return -EINVAL;
}
- bclk_rate = params_rate(params) * 2;
+ bclk_rate = params_rate(params) * 4;
switch (params_format(params)) {
case SNDRV_PCM_FORMAT_S16_LE:
bclk_rate *= 16;