git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
ALSA: isa: Avoid passing NULL to memory allocators
[sfrench/cifs-2.6.git]
/
sound
/
isa
/
ad1816a
/
ad1816a_lib.c
diff --git
a/sound/isa/ad1816a/ad1816a_lib.c
b/sound/isa/ad1816a/ad1816a_lib.c
index 61e8c7e524db609443b996641d913ed1278deab4..94b381a78e9e5a5850419476ae35007c2839fc0a 100644
(file)
--- a/
sound/isa/ad1816a/ad1816a_lib.c
+++ b/
sound/isa/ad1816a/ad1816a_lib.c
@@
-693,7
+693,7
@@
int snd_ad1816a_pcm(struct snd_ad1816a *chip, int device)
snd_ad1816a_init(chip);
snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
-
snd_dma_isa_data()
,
+
chip->card->dev
,
64*1024, chip->dma1 > 3 || chip->dma2 > 3 ? 128*1024 : 64*1024);
chip->pcm = pcm;