diff options
| author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2015-12-01 14:06:47 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-12-01 18:41:29 +0300 |
| commit | 8400ddf4ac4907323c7704fe57e4d138d04ae3b3 (patch) | |
| tree | ce165e57a5aa2f0477b1f01609402392c31f2880 /sound/soc/sunxi | |
| parent | 0837d8780c766bffe1fc5a5da54fb2620923a6d0 (diff) | |
| download | linux-8400ddf4ac4907323c7704fe57e4d138d04ae3b3.tar.xz | |
ASoC: sun4i-codec: pass through clk_set_rate error
Commit 1fb34b48361e ('ASoC: sun4i: Implement MIC1 capture') added back some
code that disregards the clk_set_rate error code and always returns
-EINVAL. Fix that and return the code in order to have more clue about
what's going on.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/sunxi')
| -rw-r--r-- | sound/soc/sunxi/sun4i-codec.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c index 516c7c2b479a..0dc11f547937 100644 --- a/sound/soc/sunxi/sun4i-codec.c +++ b/sound/soc/sunxi/sun4i-codec.c @@ -411,14 +411,15 @@ static int sun4i_codec_hw_params(struct snd_pcm_substream *substream, struct snd_soc_pcm_runtime *rtd = substream->private_data; struct sun4i_codec *scodec = snd_soc_card_get_drvdata(rtd->card); unsigned long clk_freq; - int hwrate; + int ret, hwrate; clk_freq = sun4i_codec_get_mod_freq(params); if (!clk_freq) return -EINVAL; - if (clk_set_rate(scodec->clk_module, clk_freq)) - return -EINVAL; + ret = clk_set_rate(scodec->clk_module, clk_freq); + if (ret) + return ret; hwrate = sun4i_codec_get_hw_rate(params); if (hwrate < 0) |