Commit 6a8125c3 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Takashi Iwai
Browse files

ALSA: mips: pass struct device to DMA API functions 



The DMA API generally relies on a struct device to work properly, and
only barely works without one for legacy reasons.  Pass the easily
available struct device from the platform_device to remedy this.

Also use GFP_KERNEL instead of GFP_USER as the gfp_t for the memory
allocation, as we should treat this allocation as a normal kernel one.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 9f7d35d9

sound/mips/sgio2audio.c

+4 −3
Original line number Diff line number Diff line
@@ -805,7 +805,7 @@ static int snd_sgio2audio_free(struct snd_sgio2audio *chip) 
		free_irq(snd_sgio2_isr_table[i].irq,

			 &chip->channel[snd_sgio2_isr_table[i].idx]);



	dma_free_coherent(NULL, MACEISA_RINGBUFFERS_SIZE,

	dma_free_coherent(chip->card->dev, MACEISA_RINGBUFFERS_SIZE,

			  chip->ring_base, chip->ring_base_dma);



	/* release card data */
@@ -843,8 +843,9 @@ static int snd_sgio2audio_create(struct snd_card *card, 


	chip->card = card;



	chip->ring_base = dma_alloc_coherent(NULL, MACEISA_RINGBUFFERS_SIZE,

					     &chip->ring_base_dma, GFP_USER);

	chip->ring_base = dma_alloc_coherent(card->dev,

					     MACEISA_RINGBUFFERS_SIZE,

					     &chip->ring_base_dma, GFP_KERNEL);

	if (chip->ring_base == NULL) {

		printk(KERN_ERR

		       "sgio2audio: could not allocate ring buffers\n");