summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-03-25 21:22:09 +0000
committerMark Brown <broonie@linaro.org>2014-03-25 21:22:09 +0000
commitb5f93fae3ed60ee6e33b7fa2a3acd1685d7d1d7c (patch)
tree89db8d380a3511718b73bf247c3ebb1185186729 /sound
parent8efe588b0f5c8d4400aee27cc7b5213715a7443b (diff)
parent002ccbb09c63a0df75382c9ace078b7cc4aee4e9 (diff)
downloadlinux-stable-b5f93fae3ed60ee6e33b7fa2a3acd1685d7d1d7c.tar.gz
linux-stable-b5f93fae3ed60ee6e33b7fa2a3acd1685d7d1d7c.tar.bz2
linux-stable-b5f93fae3ed60ee6e33b7fa2a3acd1685d7d1d7c.zip
Merge tag 'asoc-v3.15-rcar' into asoc-next
ASoC: A few more fixes for rcar Since Linus hasn't done the release yet and Morimoto-san here are some additional bug fixes for rcar which Morimoto-san sent overnight. # gpg: Signature made Mon 24 Mar 2014 11:21:18 GMT using RSA key ID 7EA229BD # gpg: Good signature from "Mark Brown <broonie@sirena.org.uk>" # gpg: aka "Mark Brown <broonie@debian.org>" # gpg: aka "Mark Brown <broonie@kernel.org>" # gpg: aka "Mark Brown <broonie@tardis.ed.ac.uk>" # gpg: aka "Mark Brown <broonie@linaro.org>" # gpg: aka "Mark Brown <Mark.Brown@linaro.org>"
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/sh/rcar/src.c18
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,
struct rsnd_dai_stream *io,
struct snd_pcm_runtime *runtime)
{
+ struct rsnd_mod *src_mod = rsnd_io_to_mod_src(io);
struct rsnd_src *src;
- unsigned int rate;
+ unsigned int rate = 0;
- src = rsnd_mod_to_src(rsnd_io_to_mod_src(io));
+ if (src_mod) {
+ src = rsnd_mod_to_src(src_mod);
+
+ /*
+ * return convert rate if SRC is used,
+ * otherwise, return runtime->rate as usual
+ */
+ rate = rsnd_src_convert_rate(src);
+ }
- /*
- * return convert rate if SRC is used,
- * otherwise, return runtime->rate as usual
- */
- rate = rsnd_src_convert_rate(src);
if (!rate)
rate = runtime->rate;