Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14d44e2c authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/misc' into topic/misc

parents 67cbf8a2 3e85fd61

sound/mips/sgio2audio.c

+1 −1
Original line number Diff line number Diff line
@@ -609,7 +609,7 @@ static int snd_sgio2audio_pcm_hw_params(struct snd_pcm_substream *substream, 
	/* alloc virtual 'dma' area */

	if (runtime->dma_area)

		vfree(runtime->dma_area);

	runtime->dma_area = vmalloc(size);

	runtime->dma_area = vmalloc_user(size);

	if (runtime->dma_area == NULL)

		return -ENOMEM;

	runtime->dma_bytes = size;

sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static int snd_pcm_alloc_vmalloc_buffer(struct snd_pcm_substream *subs, size_t s 
			return 0; /* already enough large */

		vfree(runtime->dma_area);

	}

	runtime->dma_area = vmalloc_32(size);

	runtime->dma_area = vmalloc_32_user(size);

	if (! runtime->dma_area)

		return -ENOMEM;

	runtime->dma_bytes = size;

sound/usb/usbaudio.c

+1 −1
Original line number Diff line number Diff line
@@ -752,7 +752,7 @@ static int snd_pcm_alloc_vmalloc_buffer(struct snd_pcm_substream *subs, size_t s 
			return 0; /* already large enough */

		vfree(runtime->dma_area);

	}

	runtime->dma_area = vmalloc(size);

	runtime->dma_area = vmalloc_user(size);

	if (!runtime->dma_area)

		return -ENOMEM;

	runtime->dma_bytes = size;