diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-24 07:16:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-24 07:16:43 -0400 |
| commit | 002ccbb09c63a0df75382c9ace078b7cc4aee4e9 (patch) | |
| tree | d740d4e4b22485fc8430fe9b9b443c1b49727a6e | |
| parent | b51086eaee34a2a6fd34f8a37c8e77d1b1c07a44 (diff) | |
| parent | b1eac430b6a4bee6821273d9b41dd3593eb7830b (diff) | |
Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next
| -rw-r--r-- | sound/soc/sh/rcar/src.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c index eee75ebf961c..6232b7d307aa 100644 --- a/sound/soc/sh/rcar/src.c +++ b/sound/soc/sh/rcar/src.c | |||
| @@ -182,16 +182,20 @@ unsigned int rsnd_src_get_ssi_rate(struct rsnd_priv *priv, | |||
| 182 | struct rsnd_dai_stream *io, | 182 | struct rsnd_dai_stream *io, |
| 183 | struct snd_pcm_runtime *runtime) | 183 | struct snd_pcm_runtime *runtime) |
| 184 | { | 184 | { |
| 185 | struct rsnd_mod *src_mod = rsnd_io_to_mod_src(io); | ||
| 185 | struct rsnd_src *src; | 186 | struct rsnd_src *src; |
| 186 | unsigned int rate; | 187 | unsigned int rate = 0; |
| 187 | 188 | ||
| 188 | src = rsnd_mod_to_src(rsnd_io_to_mod_src(io)); | 189 | if (src_mod) { |
| 190 | src = rsnd_mod_to_src(src_mod); | ||
| 191 | |||
| 192 | /* | ||
| 193 | * return convert rate if SRC is used, | ||
| 194 | * otherwise, return runtime->rate as usual | ||
| 195 | */ | ||
| 196 | rate = rsnd_src_convert_rate(src); | ||
| 197 | } | ||
| 189 | 198 | ||
| 190 | /* | ||
| 191 | * return convert rate if SRC is used, | ||
| 192 | * otherwise, return runtime->rate as usual | ||
| 193 | */ | ||
| 194 | rate = rsnd_src_convert_rate(src); | ||
| 195 | if (!rate) | 199 | if (!rate) |
| 196 | rate = runtime->rate; | 200 | rate = runtime->rate; |
| 197 | 201 | ||
