diff options
author | Mark Brown <broonie@kernel.org> | 2019-03-18 11:14:51 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-03-18 11:14:51 +0000 |
commit | 22d91ed32b653481f47e81719858678e8c92089e (patch) | |
tree | a10d240e35ba7fa5d6bb1c9aad1a5db622e5dddd /sound/soc/intel/skylake | |
parent | ASoC: samsung: odroid: Fix clock configuration for 44100 sample rate (diff) | |
parent | Linux 5.1-rc1 (diff) | |
download | linux-dev-22d91ed32b653481f47e81719858678e8c92089e.tar.xz linux-dev-22d91ed32b653481f47e81719858678e8c92089e.zip |
Merge tag 'v5.1-rc1' into asoc-5.1
Linux 5.1-rc1
Diffstat (limited to 'sound/soc/intel/skylake')
-rw-r--r-- | sound/soc/intel/skylake/skl-pcm.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sound/soc/intel/skylake/skl-pcm.c b/sound/soc/intel/skylake/skl-pcm.c index bb463ee6ff84..56099db8f86d 100644 --- a/sound/soc/intel/skylake/skl-pcm.c +++ b/sound/soc/intel/skylake/skl-pcm.c @@ -1298,7 +1298,6 @@ static int skl_pcm_new(struct snd_soc_pcm_runtime *rtd) struct hdac_bus *bus = dev_get_drvdata(dai->dev); struct snd_pcm *pcm = rtd->pcm; unsigned int size; - int retval = 0; struct skl *skl = bus_to_skl(bus); if (dai->driver->playback.channels_min || @@ -1307,17 +1306,13 @@ static int skl_pcm_new(struct snd_soc_pcm_runtime *rtd) size = CONFIG_SND_HDA_PREALLOC_SIZE * 1024; if (size > MAX_PREALLOC_SIZE) size = MAX_PREALLOC_SIZE; - retval = snd_pcm_lib_preallocate_pages_for_all(pcm, + snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG, snd_dma_pci_data(skl->pci), size, MAX_PREALLOC_SIZE); - if (retval) { - dev_err(dai->dev, "dma buffer allocation fail\n"); - return retval; - } } - return retval; + return 0; } static int skl_get_module_info(struct skl *skl, struct skl_module_cfg *mconfig) |