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/ad1889.c | |
parent | 0b2338a9bf36b5ac6ed43425e2f1357fb3d3841b (diff) | |
parent | 62e94da3e9d8b991a467f376441a805c5d14c9c7 (diff) | |
download | linux-stable-36e4617c01153757cde9e5fcd375a75a8f8425c3.tar.gz linux-stable-36e4617c01153757cde9e5fcd375a75a8f8425c3.tar.bz2 linux-stable-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/ad1889.c')
-rw-r--r-- | sound/pci/ad1889.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c index f333bbf41870..fef07ae648e6 100644 --- a/sound/pci/ad1889.c +++ b/sound/pci/ad1889.c @@ -644,16 +644,11 @@ snd_ad1889_pcm_init(struct snd_ad1889 *chip, int device) chip->psubs = NULL; chip->csubs = NULL; - err = snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV, + snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(chip->pci), BUFFER_BYTES_MAX / 2, BUFFER_BYTES_MAX); - if (err < 0) { - dev_err(chip->card->dev, "buffer allocation error: %d\n", err); - return err; - } - return 0; } |