diff options
Diffstat (limited to 'sound/isa/sscape.c')
| -rw-r--r-- | sound/isa/sscape.c | 7 | 
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c index 733adee5afbf..8181db4db019 100644 --- a/sound/isa/sscape.c +++ b/sound/isa/sscape.c @@ -167,12 +167,13 @@ static inline struct soundscape *get_card_soundscape(struct snd_card *c)   * I think this means that the memory has to map to   * contiguous pages of physical memory.   */ -static struct snd_dma_buffer *get_dmabuf(struct snd_dma_buffer *buf, +static struct snd_dma_buffer *get_dmabuf(struct soundscape *s, +					 struct snd_dma_buffer *buf,  					 unsigned long size)  {  	if (buf) {  		if (snd_dma_alloc_pages_fallback(SNDRV_DMA_TYPE_DEV, -						 snd_dma_isa_data(), +						 s->chip->card->dev,  						 size, buf) < 0) {  			snd_printk(KERN_ERR "sscape: Failed to allocate "  					    "%lu bytes for DMA\n", @@ -443,7 +444,7 @@ static int upload_dma_data(struct soundscape *s, const unsigned char *data,  	int ret;  	unsigned char val; -	if (!get_dmabuf(&dma, PAGE_ALIGN(32 * 1024))) +	if (!get_dmabuf(s, &dma, PAGE_ALIGN(32 * 1024)))  		return -ENOMEM;  	spin_lock_irqsave(&s->lock, flags);  |