summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-02 08:35:12 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-02 08:35:12 +0400
commit897074d89b26f3f287b144689974672b8b86b805 (patch)
treeb1cc3c5b4761c4fc635c4404ba4150063eb99967 /sound/soc
parent6a441c5c6031e4cac081f7c897f9def58544c05b (diff)
parent2525808ee827267e794d9931cd305e95ffb76605 (diff)
downloadlinux-897074d89b26f3f287b144689974672b8b86b805.tar.xz
Merge remote-tracking branch 'asoc/topic/rt5631' into asoc-next
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/rt5631.c2
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,
timesofbclk);
if (coeff < 0) {
dev_err(codec->dev, "Fail to get coeff\n");
- return -EINVAL;
+ return coeff;
}
switch (params_format(params)) {