Merge branch 'asoc-4.19' into asoc-4.20 Cirrus conflict
[muen/linux.git] / sound / soc / sh / rcar / dma.c
index c19342d189981b076fa9ae2b59ad52308b249a87..0bbc4b0ea2c6d65daf62cff46489bdc9bf20e3ec 100644 (file)
@@ -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