Merge remote-tracking branch 'asoc/topic/intel' into asoc-next

[linux-2.6-block.git] / sound / soc / intel / common / sst-firmware.c

diff --git a/sound/soc/intel/common/sst-firmware.c b/sound/soc/intel/common/sst-firmware.c
index b5659ecb80de6f9fd8f7cfab454b7a04276efc39..ebcca6dc48d189eb16b8903683db5460a3955357 100644 (file)
--- a/sound/soc/intel/common/sst-firmware.c
+++ b/sound/soc/intel/common/sst-firmware.c
@@ -269,6 +269,10 @@ int sst_dma_new(struct sst_dsp *sst)
        const char *dma_dev_name;
        int ret = 0;
 
+       if (sst->pdata->resindex_dma_base == -1)
+               /* DMA is not used, return and squelsh error messages */
+               return 0;
+
        /* configure the correct platform data for whatever DMA engine
        * is attached to the ADSP IP. */
        switch (sst->pdata->dma_engine) {