diff options
| author | Takashi Iwai <tiwai@suse.de> | 2019-02-01 12:14:53 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-02-01 17:16:40 +0100 |
| commit | 0b6a2c9cf4a00f54a0916499ece8a5cf3cced385 (patch) | |
| tree | 675b07d3e0b4b06c835cacdc42e3fc1ad6c801bf /sound/isa/wss | |
| parent | 6a8125c3cab887a236e9b1dc89a3416c50e46f56 (diff) | |
| download | linux-0b6a2c9cf4a00f54a0916499ece8a5cf3cced385.tar.gz linux-0b6a2c9cf4a00f54a0916499ece8a5cf3cced385.tar.xz | |
ALSA: isa: Avoid passing NULL to memory allocators
We used to pass NULL to memory allocators for ISA devices due to
historical reasons. But we prefer rather a proper device object to be
assigned, so let's fix it by replacing snd_dma_isa_data() call with
card->dev reference, and kill snd_dma_isa_data() definition.
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/isa/wss')
| -rw-r--r-- | sound/isa/wss/wss_lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/isa/wss/wss_lib.c b/sound/isa/wss/wss_lib.c index b11ef97bce1b..0dfb8065b403 100644 --- a/sound/isa/wss/wss_lib.c +++ b/sound/isa/wss/wss_lib.c @@ -1942,7 +1942,7 @@ int snd_wss_pcm(struct snd_wss *chip, int device) strcpy(pcm->name, snd_wss_chip_id(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; |