ASoC: rcar: bugfix: it cares about the non-src case

Commit Message

Kuninori Morimoto March 24, 2014, 4:23 a.m. UTC

From: Kuninori Morimoto <[e-mail]>

src might not exist.
kernel will be hung-up without this patch in such case.

Signed-off-by: Kuninori Morimoto <[e-mail]>
---
>> Mark

This is for mark/topic/rcar branch

 sound/soc/sh/rcar/src.c |   18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

Comments

Mark Brown March 24, 2014, 10:42 a.m. UTC | #1

On Sun, Mar 23, 2014 at 09:23:42PM -0700, Kuninori Morimoto wrote:
> From: Kuninori Morimoto <[e-mail]>
> 
> src might not exist.
> kernel will be hung-up without this patch in such case.

Applied, thanks.

Patch

diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c
index eee75eb..6232b7d 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;