Upgrade to 4.4.50-rt62

[kvmfornfv.git] / kernel / sound / soc / intel / atom / sst-mfld-platform-pcm.c

diff --git a/kernel/sound/soc/intel/atom/sst-mfld-platform-pcm.c b/kernel/sound/soc/intel/atom/sst-mfld-platform-pcm.c
index 0487cfa..2b96b11 100644 (file)
--- a/kernel/sound/soc/intel/atom/sst-mfld-platform-pcm.c
+++ b/kernel/sound/soc/intel/atom/sst-mfld-platform-pcm.c
@@ -762,6 +762,9 @@ static int sst_soc_prepare(struct device *dev)
        struct sst_data *drv = dev_get_drvdata(dev);
        int i;
 
+       if (!drv->soc_card)
+               return 0;
+
        /* suspend all pcms first */
        snd_soc_suspend(drv->soc_card->dev);
        snd_soc_poweroff(drv->soc_card->dev);
@@ -784,6 +787,9 @@ static void sst_soc_complete(struct device *dev)
        struct sst_data *drv = dev_get_drvdata(dev);
        int i;
 
+       if (!drv->soc_card)
+               return;
+
        /* restart SSPs */
        for (i = 0; i < drv->soc_card->num_rtd; i++) {
                struct snd_soc_dai *dai = drv->soc_card->rtd[i].cpu_dai;