ASoC: core: Merge Samsung fixes to avoid trivial context conflict

Merge branch 'fix/samsung' of
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into
asoc-component to resolve trivial conflict

Conflicts:
	sound/soc/samsung/i2s.c

diff --cc sound/soc/samsung/i2s.c
index efa7314,6bbeb0b..abbcbe4
--- 1/sound/soc/samsung/i2s.c
--- 2/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@@ -1111,9 -1110,12 +1114,13 @@@ static int samsung_i2s_probe(struct pla
  
        if (samsung_dai_type == TYPE_SEC) {
                sec_dai = dev_get_drvdata(&pdev->dev);
 -              snd_soc_register_dai(&sec_dai->pdev->dev,
 -                      &sec_dai->i2s_dai_drv);
+               if (!sec_dai) {
+                       dev_err(&pdev->dev, "Unable to get drvdata\n");
+                       return -EFAULT;
+               }
 +              snd_soc_register_component(&sec_dai->pdev->dev,
 +                                         &samsung_i2s_component,
 +                                         &sec_dai->i2s_dai_drv, 1);
                asoc_dma_platform_register(&pdev->dev);
                return 0;
        }