diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-28 22:13:14 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-28 22:13:14 +0000 |
| commit | 49b72776f3f614e1e3701b79b0b2c540b8b90e1b (patch) | |
| tree | fccfa2e65afcd86d42e9630fdca05cc1ce182ac2 /sound | |
| parent | cc0b401ad87e830843d3034f892c4017f9837fae (diff) | |
| parent | fc07ecd851bd082265b52838eff12f50b88f6114 (diff) | |
| download | blackbird-op-linux-49b72776f3f614e1e3701b79b0b2c540b8b90e1b.tar.gz blackbird-op-linux-49b72776f3f614e1e3701b79b0b2c540b8b90e1b.zip | |
Merge branch 'for-3.2' into for-3.3
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wm8994.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 380e3f2f3190..6bcb1b6145cb 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -2357,6 +2357,11 @@ static int wm8994_hw_params(struct snd_pcm_substream *substream, bclk |= best << WM8994_AIF1_BCLK_DIV_SHIFT; lrclk = bclk_rate / params_rate(params); + if (!lrclk) { + dev_err(dai->dev, "Unable to generate LRCLK from %dHz BCLK\n", + bclk_rate); + return -EINVAL; + } dev_dbg(dai->dev, "Using LRCLK rate %d for actual LRCLK %dHz\n", lrclk, bclk_rate / lrclk); |
