Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus

4 files changed, 7 insertions, 1 deletions

diff --git a/sound/soc/intel/sst-acpi.c b/sound/soc/intel/sst-acpi.c
index b3d84560fbb5..42f293f9c6e2 100644
--- a/sound/soc/intel/sst-acpi.c
+++ b/sound/soc/intel/sst-acpi.c
@@ -142,6 +142,7 @@ static int sst_acpi_probe(struct platform_device *pdev)
         sst_acpi->desc = desc;
         sst_acpi->mach = mach;
 
+        sst_pdata->resindex_dma_base = desc->resindex_dma_base;
         if (desc->resindex_dma_base >= 0) {
                 sst_pdata->dma_engine = desc->dma_engine;
                 sst_pdata->dma_base = desc->resindex_dma_base;
diff --git a/sound/soc/intel/sst-dsp.h b/sound/soc/intel/sst-dsp.h
index f291e32f0077..148d8c589a43 100644
--- a/sound/soc/intel/sst-dsp.h
+++ b/sound/soc/intel/sst-dsp.h
@@ -206,6 +206,7 @@ struct sst_pdata {
         const struct firmware *fw;
 
         /* DMA */
+        int resindex_dma_base; /* other fields invalid if equals to -1 */
         u32 dma_base;
         u32 dma_size;
         int dma_engine;
diff --git a/sound/soc/intel/sst-firmware.c b/sound/soc/intel/sst-firmware.c
index 5f71ef607a57..4a993d16a235 100644
--- a/sound/soc/intel/sst-firmware.c
+++ b/sound/soc/intel/sst-firmware.c
@@ -271,6 +271,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) {
diff --git a/sound/soc/intel/sst/sst_acpi.c b/sound/soc/intel/sst/sst_acpi.c
index b782dfdcdbba..b536ddd2517d 100644
--- a/sound/soc/intel/sst/sst_acpi.c
+++ b/sound/soc/intel/sst/sst_acpi.c
@@ -309,7 +309,7 @@ static int sst_acpi_probe(struct platform_device *pdev)
         ctx->shim_regs64 = devm_kzalloc(ctx->dev, sizeof(*ctx->shim_regs64),
                                         GFP_KERNEL);
         if (!ctx->shim_regs64) {
-                return -ENOMEM;
+                ret = -ENOMEM;
                 goto do_sst_cleanup;
         }