summaryrefslogtreecommitdiffstats
path: root/sound/soc/intel/sst-firmware.c
diff options
context:
space:
mode:
authorPierre-Louis Bossart2015-03-20 21:31:34 +0100
committerMark Brown2015-03-23 07:25:53 +0100
commit6212755eff3171e0211bb6a9f4706e115217588c (patch)
tree3cb73b6894c097c6e4d408f8f66f34c338b78dff /sound/soc/intel/sst-firmware.c
parentASoC: Intel: acpi_probe: fix error return path (diff)
downloadkernel-qcow2-linux-6212755eff3171e0211bb6a9f4706e115217588c.tar.gz
kernel-qcow2-linux-6212755eff3171e0211bb6a9f4706e115217588c.tar.xz
kernel-qcow2-linux-6212755eff3171e0211bb6a9f4706e115217588c.zip
ASoC: Intel: remove misleading DMA error messages on Baytrail platforms
During probe, the Baytrail audio driver reports errors such as: [44.172040] baytrail-pcm-audio baytrail-pcm-audio: error: invalid DMA engine 0 [44.172137] baytrail-pcm-audio baytrail-pcm-audio: sst_dma_new failed Those error messages are misleading, there is no error since the DMA is explicitly not configured for Baytrail. Add a test to remove DMA error checks when DMA is not configured and return silently. Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel/sst-firmware.c')
-rw-r--r--sound/soc/intel/sst-firmware.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/intel/sst-firmware.c b/sound/soc/intel/sst-firmware.c
index b3f9489794a6..28beceb3f252 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) {