From: Mark Brown <broonie@kernel.org>
Date: Wed, 4 Mar 2020 13:41:44 +0000 (+0000)
Subject: Merge branch 'for-5.6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=cc6eb9b512c8411e3fa42417d9eefa1c1a86caa3;p=linux.git

Merge branch 'for-5.6' of https://git./linux/kernel/git/broonie/sound into asoc-5.7
---

cc6eb9b512c8411e3fa42417d9eefa1c1a86caa3
diff --cc sound/soc/stm/stm32_sai_sub.c
index 0bbf9ed5e48b1,10eb4b8e8e7ee..fe4903260d4e4
--- a/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;