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/sh/rcar/core.c | |
| parent | 2b13bee3884926cba22061efa75bd315e871de24 (diff) | |
| parent | 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b (diff) | |
Merge tag 'v5.1-rc1' into asoc-5.1
Linux 5.1-rc1
Diffstat (limited to 'sound/soc/sh/rcar/core.c')
| -rw-r--r-- | sound/soc/sh/rcar/core.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 8d3758f862f1..4fe83e611c01 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -1575,7 +1575,6 @@ static int rsnd_preallocate_pages(struct snd_soc_pcm_runtime *rtd, struct rsnd_priv *priv = rsnd_io_to_priv(io); struct device *dev = rsnd_priv_to_dev(priv); struct snd_pcm_substream *substream; - int err; /* * use Audio-DMAC dev if we can use IPMMU @@ -1588,12 +1587,10 @@ static int rsnd_preallocate_pages(struct snd_soc_pcm_runtime *rtd, for (substream = rtd->pcm->streams[stream].substream; substream; substream = substream->next) { - err = snd_pcm_lib_preallocate_pages(substream, + snd_pcm_lib_preallocate_pages(substream, SNDRV_DMA_TYPE_DEV, dev, PREALLOC_BUFFER, PREALLOC_BUFFER_MAX); - if (err < 0) - return err; } return 0; |