diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-20 15:20:38 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-20 15:20:38 +0000 |
| commit | 4b47ab4265c9f7164f9c897792551d4640eaf9ab (patch) | |
| tree | 5d904b60e62d1cb13a69225fddf35ffdd659a69f /sound | |
| parent | cde4d7596c838e073ad0f1f9bd04e7ac01778d34 (diff) | |
| parent | a0d32bca511fd6b570e964ca38a0c3dcd9eacafb (diff) | |
| download | linux-4b47ab4265c9f7164f9c897792551d4640eaf9ab.tar.gz linux-4b47ab4265c9f7164f9c897792551d4640eaf9ab.tar.bz2 linux-4b47ab4265c9f7164f9c897792551d4640eaf9ab.zip | |
Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/sh/rcar/core.c | 13 | ||||
| -rw-r--r-- | sound/soc/sh/rcar/scu.c | 2 |
2 files changed, 6 insertions, 9 deletions
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 78c35b44fc04..b3653d37f75f 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -200,9 +200,8 @@ static void rsnd_dma_do_work(struct work_struct *work) return; } + dma_async_issue_pending(dma->chan); } - - 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)); diff --git a/sound/soc/sh/rcar/scu.c b/sound/soc/sh/rcar/scu.c index 1ab1bce6be7f..5e46ef2e8bb8 100644 --- a/sound/soc/sh/rcar/scu.c +++ b/sound/soc/sh/rcar/scu.c @@ -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; /* |