OSDN Git Service

ASoC: rsnd: add warning message to rsnd_kctrl_accept_runtime()
authorJiada Wang <jiada_wang@mentor.com>
Mon, 3 Sep 2018 07:05:11 +0000 (07:05 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 3 Sep 2018 13:37:11 +0000 (14:37 +0100)
Add warning message to rsnd_kctrl_accept_runtime(), when kctrl
update is rejected due to corresponding dai-link is idle.
So that user can notice the reason of kctrl update failure.

Signed-off-by: Jiada Wang <jiada_wang@mentor.com>
Signed-off-by: Timo Wischer <twischer@de.adit-jv.com>
[kuninori: adjust to upstream]
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sh/rcar/core.c

index f8425d8..ab7e317 100644 (file)
@@ -1263,8 +1263,15 @@ int rsnd_kctrl_accept_anytime(struct rsnd_dai_stream *io)
 int rsnd_kctrl_accept_runtime(struct rsnd_dai_stream *io)
 {
        struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
+       struct rsnd_priv *priv = rsnd_io_to_priv(io);
+       struct device *dev = rsnd_priv_to_dev(priv);
+
+       if (!runtime) {
+               dev_warn(dev, "Can't update kctrl when idle\n");
+               return 0;
+       }
 
-       return !!runtime;
+       return 1;
 }
 
 struct rsnd_kctrl_cfg *rsnd_kctrl_init_m(struct rsnd_kctrl_cfg_m *cfg)