diff options
| author | Mark Brown <broonie@kernel.org> | 2018-09-10 18:55:12 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-09-10 18:55:12 +0100 |
| commit | 54a3da1c105ca91c4d32f25c3d9c57a61e9a3467 (patch) | |
| tree | 5be69ff9ccab03760f2ae17cbaecbfea0b016087 /sound/soc/sh/rcar/dma.c | |
| parent | 1c8bc7b3de5e76cb89aacdc7be1475a028af505f (diff) | |
| parent | 90a3b7f8aba3011badacd6d8121e03aa24ac79d1 (diff) | |
Merge branch 'asoc-4.19' into asoc-4.20 Cirrus conflict
Diffstat (limited to 'sound/soc/sh/rcar/dma.c')
| -rw-r--r-- | sound/soc/sh/rcar/dma.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/sh/rcar/dma.c b/sound/soc/sh/rcar/dma.c index c19342d18998..0bbc4b0ea2c6 100644 --- a/sound/soc/sh/rcar/dma.c +++ b/sound/soc/sh/rcar/dma.c @@ -241,6 +241,10 @@ static int rsnd_dmaen_attach(struct rsnd_dai_stream *io, /* try to get DMAEngine channel */ chan = rsnd_dmaen_request_channel(io, mod_from, mod_to); if (IS_ERR_OR_NULL(chan)) { + /* Let's follow when -EPROBE_DEFER case */ + if (PTR_ERR(chan) == -EPROBE_DEFER) + return PTR_ERR(chan); + /* * DMA failed. try to PIO mode * see |