summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-06-22 17:21:17 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-07-23 18:49:14 +0100
commitb8edf3e5522735c8ce78b81845f7a1a2d4a08626 (patch)
tree5afcecc034edb6b0efbfb9789475c7a69ce70029 /sound/soc
parent15d47763b354256053c390a9b7bc9f2b4f197711 (diff)
downloadlinux-stable-b8edf3e5522735c8ce78b81845f7a1a2d4a08626.tar.gz
linux-stable-b8edf3e5522735c8ce78b81845f7a1a2d4a08626.tar.bz2
linux-stable-b8edf3e5522735c8ce78b81845f7a1a2d4a08626.zip
ASoC: wm8994: Ensure there are enough BCLKs for four channels
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> Cc: stable@vger.kernel.org
Diffstat (limited to 'sound/soc')
-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 bb62f4b3d563..235577a3d0e7 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -2649,7 +2649,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;