summaryrefslogtreecommitdiffstats
path: root/sound/sparc
diff options
context:
space:
mode:
authorTakashi Iwai2019-02-08 14:12:15 +0100
committerTakashi Iwai2019-02-08 14:12:15 +0100
commit36e4617c01153757cde9e5fcd375a75a8f8425c3 (patch)
tree3c95a8e5efc6cd1616bd3eadda68cb27101688b3 /sound/sparc
parentALSA: cs46xx: Clean up proc file creations (diff)
parentmedia: Drop superfluous PCM preallocation error checks (diff)
downloadkernel-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/sparc')
-rw-r--r--sound/sparc/dbri.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c
index 682166202098..5e36d9bc971d 100644
--- a/sound/sparc/dbri.c
+++ b/sound/sparc/dbri.c
@@ -2243,12 +2243,9 @@ static int snd_dbri_pcm(struct snd_card *card)
pcm->info_flags = 0;
strcpy(pcm->name, card->shortname);
- if ((err = snd_pcm_lib_preallocate_pages_for_all(pcm,
- SNDRV_DMA_TYPE_CONTINUOUS,
- snd_dma_continuous_data(GFP_KERNEL),
- 64 * 1024, 64 * 1024)) < 0)
- return err;
-
+ snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS,
+ snd_dma_continuous_data(GFP_KERNEL),
+ 64 * 1024, 64 * 1024);
return 0;
}