diff options
| author | Takashi Iwai <tiwai@suse.de> | 2019-02-08 14:12:15 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-02-08 14:12:15 +0100 |
| commit | 36e4617c01153757cde9e5fcd375a75a8f8425c3 (patch) | |
| tree | 3c95a8e5efc6cd1616bd3eadda68cb27101688b3 /sound/pci/via82xx_modem.c | |
| parent | ALSA: cs46xx: Clean up proc file creations (diff) | |
| parent | media: Drop superfluous PCM preallocation error checks (diff) | |
| download | linux-36e4617c01153757cde9e5fcd375a75a8f8425c3.tar.xz 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/via82xx_modem.c')
| -rw-r--r-- | sound/pci/via82xx_modem.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sound/pci/via82xx_modem.c b/sound/pci/via82xx_modem.c index 848bf9dbf8cd..7e0bebce7b77 100644 --- a/sound/pci/via82xx_modem.c +++ b/sound/pci/via82xx_modem.c @@ -865,11 +865,9 @@ static int snd_via686_pcm_new(struct via82xx_modem *chip) init_viadev(chip, 0, VIA_REG_MO_STATUS, 0); init_viadev(chip, 1, VIA_REG_MI_STATUS, 1); - if ((err = snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG, - snd_dma_pci_data(chip->pci), - 64*1024, 128*1024)) < 0) - return err; - + snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG, + snd_dma_pci_data(chip->pci), + 64*1024, 128*1024); return 0; } |