diff options
author | Takashi Iwai <tiwai@suse.de> | 2005-10-10 05:56:31 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2005-11-04 07:18:00 -0500 |
commit | b1d5776d865951c213a1caaab5d8bf5de7615dbd (patch) | |
tree | f999dca30f6e2d03a9176b86c613ae8f4531a6d6 /sound/usb/usbaudio.c | |
parent | 93f2e37840a9a7c3693ca6961fe6ad46b250f3b9 (diff) |
[ALSA] Remove vmalloc wrapper, kfree_nocheck()
- Remove vmalloc wrapper
- Add release_and_free_resource() to remove kfree_nocheck() from each driver
and simplify the code
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/usbaudio.c')
-rw-r--r-- | sound/usb/usbaudio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c index 5429b169877a..4589c637a25e 100644 --- a/sound/usb/usbaudio.c +++ b/sound/usb/usbaudio.c | |||
@@ -692,9 +692,9 @@ static int snd_pcm_alloc_vmalloc_buffer(snd_pcm_substream_t *subs, size_t size) | |||
692 | if (runtime->dma_area) { | 692 | if (runtime->dma_area) { |
693 | if (runtime->dma_bytes >= size) | 693 | if (runtime->dma_bytes >= size) |
694 | return 0; /* already large enough */ | 694 | return 0; /* already large enough */ |
695 | vfree_nocheck(runtime->dma_area); | 695 | vfree(runtime->dma_area); |
696 | } | 696 | } |
697 | runtime->dma_area = vmalloc_nocheck(size); | 697 | runtime->dma_area = vmalloc(size); |
698 | if (! runtime->dma_area) | 698 | if (! runtime->dma_area) |
699 | return -ENOMEM; | 699 | return -ENOMEM; |
700 | runtime->dma_bytes = size; | 700 | runtime->dma_bytes = size; |
@@ -706,7 +706,7 @@ static int snd_pcm_free_vmalloc_buffer(snd_pcm_substream_t *subs) | |||
706 | { | 706 | { |
707 | snd_pcm_runtime_t *runtime = subs->runtime; | 707 | snd_pcm_runtime_t *runtime = subs->runtime; |
708 | if (runtime->dma_area) { | 708 | if (runtime->dma_area) { |
709 | vfree_nocheck(runtime->dma_area); | 709 | vfree(runtime->dma_area); |
710 | runtime->dma_area = NULL; | 710 | runtime->dma_area = NULL; |
711 | } | 711 | } |
712 | return 0; | 712 | return 0; |