From 9471942094596bfb0a2871ed339722bc1e9503e2 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Thu, 9 Feb 2006 20:04:16 +0100 Subject: [PATCH] --- yaml --- r: 22730 b: refs/heads/master c: 9c4be3d334808d1dedea7db0ae84759bfac8e18e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/drivers/vx/vx_pcm.c | 7 +++---- trunk/sound/usb/usbaudio.c | 7 +++---- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 3d8c28b09ecd..d27e021ab6ba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dbc967760b075aef3b181deda6639d73bbd0ad07 +refs/heads/master: 9c4be3d334808d1dedea7db0ae84759bfac8e18e diff --git a/trunk/sound/drivers/vx/vx_pcm.c b/trunk/sound/drivers/vx/vx_pcm.c index 464109e421d4..2195e25087b4 100644 --- a/trunk/sound/drivers/vx/vx_pcm.c +++ b/trunk/sound/drivers/vx/vx_pcm.c @@ -98,10 +98,9 @@ static int snd_pcm_alloc_vmalloc_buffer(struct snd_pcm_substream *subs, size_t s static int snd_pcm_free_vmalloc_buffer(struct snd_pcm_substream *subs) { struct snd_pcm_runtime *runtime = subs->runtime; - if (runtime->dma_area) { - vfree(runtime->dma_area); - runtime->dma_area = NULL; - } + + vfree(runtime->dma_area); + runtime->dma_area = NULL; return 0; } diff --git a/trunk/sound/usb/usbaudio.c b/trunk/sound/usb/usbaudio.c index 7b1b9f29f377..039f27dc1f08 100644 --- a/trunk/sound/usb/usbaudio.c +++ b/trunk/sound/usb/usbaudio.c @@ -720,10 +720,9 @@ static int snd_pcm_alloc_vmalloc_buffer(struct snd_pcm_substream *subs, size_t s static int snd_pcm_free_vmalloc_buffer(struct snd_pcm_substream *subs) { struct snd_pcm_runtime *runtime = subs->runtime; - if (runtime->dma_area) { - vfree(runtime->dma_area); - runtime->dma_area = NULL; - } + + vfree(runtime->dma_area); + runtime->dma_area = NULL; return 0; }