Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus (4b47ab42) · Commits · 戴 / test

sound/soc/sh/rcar/core.c

+5 −8

Original line number	Diff line number	Diff line
		@@ -200,10 +200,9 @@ static void rsnd_dma_do_work(struct work_struct *work)
		return;
		}

		}

		dma_async_issue_pending(dma->chan);
		}
		}

		int rsnd_dma_available(struct rsnd_dma *dma)
		{
		@@ -288,15 +287,13 @@ int rsnd_dai_connect(struct rsnd_dai *rdai,
		struct rsnd_mod *mod,
		struct rsnd_dai_stream *io)
		{
		struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
		struct device *dev = rsnd_priv_to_dev(priv);

		if (!mod) {
		dev_err(dev, "NULL mod\n");
		if (!mod)
		return -EIO;
		}

		if (!list_empty(&mod->list)) {
		struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
		struct device *dev = rsnd_priv_to_dev(priv);

		dev_err(dev, "%s%d is not empty\n",
		rsnd_mod_name(mod),
		rsnd_mod_id(mod));

+1 −1

Original line number	Diff line number	Diff line
		@@ -68,7 +68,7 @@ static int rsnd_scu_set_route(struct rsnd_priv *priv,
		return 0;

		id = rsnd_mod_id(mod);
		if (id < 0 \|\| id > ARRAY_SIZE(routes))
		if (id < 0 \|\| id >= ARRAY_SIZE(routes))
		return -EIO;

		/*