diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 110b99da7acd..0785f84b54db 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -368,7 +368,7 @@ rsnd_dma_channel_err: /* * DMA failed. try to PIO mode * see - * rsnd_ssi_dma_remove() + * rsnd_ssi_fallback() * rsnd_rdai_continuance_probe() */ return -EAGAIN; @@ -1023,7 +1023,7 @@ static int rsnd_rdai_continuance_probe(struct rsnd_priv *priv, * SSI will be switch to PIO mode if it was DMA mode * see * rsnd_dma_init() - * rsnd_ssi_dma_remove() + * rsnd_ssi_fallback() */ rsnd_dai_call(remove, io, rdai); @@ -1033,6 +1033,11 @@ static int rsnd_rdai_continuance_probe(struct rsnd_priv *priv, rsnd_path_break(priv, io, src); rsnd_path_break(priv, io, dvc); + /* + * fallback + */ + rsnd_dai_call(fallback, io, rdai); + /* * retry to "probe". * DAI has SSI which is PIO mode only now. diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index ed44ca8af057..83e1066e31bf 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h @@ -206,6 +206,8 @@ struct rsnd_mod_ops { int (*pcm_new)(struct rsnd_mod *mod, struct rsnd_dai *rdai, struct snd_soc_pcm_runtime *rtd); + int (*fallback)(struct rsnd_mod *mod, + struct rsnd_dai *rdai); }; struct rsnd_dai_stream; diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index 346d3dc66d73..e03e70b4f843 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -464,12 +464,18 @@ static int rsnd_ssi_dma_probe(struct rsnd_mod *mod, static int rsnd_ssi_dma_remove(struct rsnd_mod *mod, struct rsnd_dai *rdai) +{ + rsnd_dma_quit(rsnd_mod_to_priv(mod), rsnd_mod_to_dma(mod)); + + return 0; +} + +static int rsnd_ssi_fallback(struct rsnd_mod *mod, + struct rsnd_dai *rdai) { struct rsnd_priv *priv = rsnd_mod_to_priv(mod); struct device *dev = rsnd_priv_to_dev(priv); - rsnd_dma_quit(rsnd_mod_to_priv(mod), rsnd_mod_to_dma(mod)); - /* * fallback to PIO * @@ -541,6 +547,7 @@ static struct rsnd_mod_ops rsnd_ssi_dma_ops = { .quit = rsnd_ssi_quit, .start = rsnd_ssi_dma_start, .stop = rsnd_ssi_dma_stop, + .fallback = rsnd_ssi_fallback, }; /*