Merge branch 'for-5.6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...

diff --cc sound/soc/stm/stm32_sai_sub.c
index 0bbf9ed5e48b13fc11fbb38f3368c1808756c3ae,10eb4b8e8e7eea2ae3c8567594bc95b42388a3d8..fe4903260d4e40f40f23ac08a189ae84a6074f4e
--- 1/sound/soc/stm/stm32_sai_sub.c
--- 2/sound/soc/stm/stm32_sai_sub.c
+++ b/sound/soc/stm/stm32_sai_sub.c
@@@ -1547,8 -1543,14 +1547,15 @@@ static int stm32_sai_sub_probe(struct p
                return ret;
        }
  
-       ret = devm_snd_soc_register_component(&pdev->dev, &stm32_component,
-                                             &sai->cpu_dai_drv, 1);
+       ret = snd_dmaengine_pcm_register(&pdev->dev, conf, 0);
+       if (ret) {
 -              dev_err(&pdev->dev, "Could not register pcm dma\n");
++              if (ret != -EPROBE_DEFER)
++                      dev_err(&pdev->dev, "Could not register pcm dma\n");
+               return ret;
+       }
+ 
+       ret = snd_soc_register_component(&pdev->dev, &stm32_component,
+                                        &sai->cpu_dai_drv, 1);
        if (ret)
                return ret;