diff options
| author | Takashi Iwai | 2019-02-08 14:12:15 +0100 |
|---|---|---|
| committer | Takashi Iwai | 2019-02-08 14:12:15 +0100 |
| commit | 36e4617c01153757cde9e5fcd375a75a8f8425c3 (patch) | |
| tree | 3c95a8e5efc6cd1616bd3eadda68cb27101688b3 /sound/pci/rme9652 | |
| parent | ALSA: cs46xx: Clean up proc file creations (diff) | |
| parent | media: Drop superfluous PCM preallocation error checks (diff) | |
| download | kernel-qcow2-linux-36e4617c01153757cde9e5fcd375a75a8f8425c3.tar.gz kernel-qcow2-linux-36e4617c01153757cde9e5fcd375a75a8f8425c3.tar.xz kernel-qcow2-linux-36e4617c01153757cde9e5fcd375a75a8f8425c3.zip | |
Merge branch 'topic/memory-device-fixes-2' into for-next
Pull further device memory allocation cleanups (but no API change yet).
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/rme9652')
| -rw-r--r-- | sound/pci/rme9652/hdspm.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c index d485dd8a7b72..1209cf0b05e0 100644 --- a/sound/pci/rme9652/hdspm.c +++ b/sound/pci/rme9652/hdspm.c @@ -6402,7 +6402,6 @@ static int snd_hdspm_create_hwdep(struct snd_card *card, ------------------------------------------------------------*/ static int snd_hdspm_preallocate_memory(struct hdspm *hdspm) { - int err; struct snd_pcm *pcm; size_t wanted; @@ -6410,21 +6409,10 @@ static int snd_hdspm_preallocate_memory(struct hdspm *hdspm) wanted = HDSPM_DMA_AREA_BYTES; - err = - snd_pcm_lib_preallocate_pages_for_all(pcm, - SNDRV_DMA_TYPE_DEV_SG, - snd_dma_pci_data(hdspm->pci), - wanted, - wanted); - if (err < 0) { - dev_dbg(hdspm->card->dev, - "Could not preallocate %zd Bytes\n", wanted); - - return err; - } else - dev_dbg(hdspm->card->dev, - " Preallocated %zd Bytes\n", wanted); - + snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG, + snd_dma_pci_data(hdspm->pci), + wanted, wanted); + dev_dbg(hdspm->card->dev, " Preallocated %zd Bytes\n", wanted); return 0; } |