| From aa61b2d3709ecccdb8e42e3b9de879b30d4b5d8e Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Wed, 15 Jul 2015 07:12:36 +0000 |
| Subject: [PATCH 290/326] ASoC: rsnd: enable module multi connection |
| |
| '8a4e379b54f8("ASoC: rsnd: remove io from rsnd_mod")' removed mod/io |
| relationship. rsnd_dai_connect() mod/io check is no longer needed |
| |
| Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Tested-by: Keita Kobayashi <keita.kobayashi.ym@renesas.com> |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| (cherry picked from commit d6f8d5b4422a5a391c02df97af9ef7da5a929d71) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| sound/soc/sh/rcar/core.c | 10 ---------- |
| 1 file changed, 10 deletions(-) |
| |
| diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c |
| index d44bfb79779a..ff4f15a2666a 100644 |
| --- a/sound/soc/sh/rcar/core.c |
| +++ b/sound/soc/sh/rcar/core.c |
| @@ -277,16 +277,6 @@ static int rsnd_dai_connect(struct rsnd_mod *mod, |
| if (!mod) |
| return -EIO; |
| |
| - if (io->mod[mod->type]) { |
| - 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)); |
| - return -EIO; |
| - } |
| - |
| io->mod[mod->type] = mod; |
| |
| return 0; |
| -- |
| 2.6.2 |
| |
