diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-09 10:22:17 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-09 10:22:17 -0500 |
| commit | a50345152e9f66e3bc7847c58980b55f5ff7bec4 (patch) | |
| tree | 84994f751e6e39f0fdca3d207cf7ff1a57617e4e /sound | |
| parent | d5767418393f55ac5f01d372c9887c7267aa59d9 (diff) | |
| parent | 2525808ee827267e794d9931cd305e95ffb76605 (diff) | |
Merge remote-tracking branch 'asoc/topic/rt5631' into asoc-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/rt5631.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/rt5631.c b/sound/soc/codecs/rt5631.c index 960d0e93cce9..d6ca615489ee 100644 --- a/sound/soc/codecs/rt5631.c +++ b/sound/soc/codecs/rt5631.c | |||
| @@ -1382,7 +1382,7 @@ static int rt5631_hifi_pcm_params(struct snd_pcm_substream *substream, | |||
| 1382 | timesofbclk); | 1382 | timesofbclk); |
| 1383 | if (coeff < 0) { | 1383 | if (coeff < 0) { |
| 1384 | dev_err(codec->dev, "Fail to get coeff\n"); | 1384 | dev_err(codec->dev, "Fail to get coeff\n"); |
| 1385 | return -EINVAL; | 1385 | return coeff; |
| 1386 | } | 1386 | } |
| 1387 | 1387 | ||
| 1388 | switch (params_format(params)) { | 1388 | switch (params_format(params)) { |