redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus

hifive-unleashed-5.1
Mark Brown 2013-11-20 15:20:38 +00:00
parent cde4d7596c a0d32bca51
commit 4b47ab4265
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sound/soc/sh/rcar/core.c
View File

@ -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));

2
sound/soc/sh/rcar/scu.c
View File

@ -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;
/*