diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-18 06:53:45 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-18 06:53:45 -0500 |
| commit | 14d44e2c2cb2ef3c88c5090a2d419772e15e7a16 (patch) | |
| tree | c7f96e1c3305eb93a1affd449cc41b99277716d6 /sound/usb | |
| parent | 67cbf8a216259dceefe570f6dc14746f43b2e627 (diff) | |
| parent | 3e85fd614c7b6bb7f33bb04a0dcb5a3bfca4c0fe (diff) | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/usbaudio.c | 2 |
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 | |||
| 752 | return 0; /* already large enough */ | 752 | return 0; /* already large enough */ |
| 753 | vfree(runtime->dma_area); | 753 | vfree(runtime->dma_area); |
| 754 | } | 754 | } |
| 755 | runtime->dma_area = vmalloc(size); | 755 | runtime->dma_area = vmalloc_user(size); |
| 756 | if (!runtime->dma_area) | 756 | if (!runtime->dma_area) |
| 757 | return -ENOMEM; | 757 | return -ENOMEM; |
| 758 | runtime->dma_bytes = size; | 758 | runtime->dma_bytes = size; |