summaryrefslogtreecommitdiffstats
path: root/sound/usb/usbaudio.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-12-21 12:05:40 +0100
committerTakashi Iwai <tiwai@suse.de>2009-12-21 12:05:40 +0100
commit1f26cb92a28541da1c9b27571e40b08333595773 (patch)
tree90e9c7f7fe9bdccc6cd356afcf3977af256c9a21 /sound/usb/usbaudio.c
parent2c3b9b50db5fe8d6039dfdfc44202fcd49eb9d00 (diff)
parentdb8cf334f66bdf1ba2b3d2f7128095fc9b7a6e2b (diff)
downloadop-kernel-dev-1f26cb92a28541da1c9b27571e40b08333595773.zip
op-kernel-dev-1f26cb92a28541da1c9b27571e40b08333595773.tar.gz
Merge branch 'fix/misc' into for-linus
Diffstat (limited to 'sound/usb/usbaudio.c')
-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 b074a59..4963def 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;
OpenPOWER on IntegriCloud