summaryrefslogtreecommitdiffstats
path: root/sound/usb
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-12-18 12:53:45 +0100
committerTakashi Iwai <tiwai@suse.de>2009-12-18 12:53:45 +0100
commit14d44e2c2cb2ef3c88c5090a2d419772e15e7a16 (patch)
treec7f96e1c3305eb93a1affd449cc41b99277716d6 /sound/usb
parent67cbf8a216259dceefe570f6dc14746f43b2e627 (diff)
parent3e85fd614c7b6bb7f33bb04a0dcb5a3bfca4c0fe (diff)
downloadlinux-14d44e2c2cb2ef3c88c5090a2d419772e15e7a16.tar.gz
linux-14d44e2c2cb2ef3c88c5090a2d419772e15e7a16.tar.bz2
linux-14d44e2c2cb2ef3c88c5090a2d419772e15e7a16.zip
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/usb')
-rw-r--r--sound/usb/usbaudio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index f352141cf8ee..af8869a8a79e 100644
--- a/sound/usb/usbaudio.c
+++ b/sound/usb/usbaudio.c
@@ -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;