diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-21 10:10:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-21 10:10:23 -0800 |
| commit | 9d5eb6787aeb1dd0a0c71c5c41ca1b4cac3e6be4 (patch) | |
| tree | 3953048d5c9c08d9e1f35056534289084b156776 /sound/usb/usbaudio.c | |
| parent | 3d354cbc43db36e7e8b27ed78901064b87864ffc (diff) | |
| parent | 1f26cb92a28541da1c9b27571e40b08333595773 (diff) | |
| download | op-kernel-dev-9d5eb6787aeb1dd0a0c71c5c41ca1b4cac3e6be4.zip op-kernel-dev-9d5eb6787aeb1dd0a0c71c5c41ca1b4cac3e6be4.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (24 commits)
ALSA: sbawe: fix memory detection
ALSA: fix incorrect rounding direction in snd_interval_ratnum()
ALSA: HDA: add powersaving hook for Realtek
ALSA: HDA: remove useless mixers on Aspire 8930G
ALSA: HDA: simplify Aspire 8930G verb array
ALSA: hda: Set Front Mic to input vref 50% for Lenovo 3000 Y410
ALSA: hda/realtek: Remove extra .capsrc_nids initialization for ALC889_INTEL
ALSA: Use kzalloc for allocating only one thing
ALSA: AACI: switch to per-pcm locking
ALSA: AACI: add double-rate support
ALSA: AACI: factor common hw_params logic into aaci_pcm_hw_params
ALSA: AACI: cleanup aaci_pcm_hw_params
ALSA: AACI: simplify codec rate information
ALSA: aaci - Fix a typo
ASoC: wm8974: fix a wrong bit definition
sound: sgio2audio/pdaudiocf/usb-audio: initialize PCM buffer
ALSA: hda - Fix quirk for Maxdata obook4-1
ALSA: hda - Fix missing capsrc_nids for ALC88x
ALSA: hda - Make use of beep device found in Dell Vostro 1015n
ALSA: hda - Fixed internal mic initialization for Dell Vostro 1015
...
Diffstat (limited to 'sound/usb/usbaudio.c')
| -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 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; |
