linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / sound / drivers / vx / vx_pcm.c

diff --git a/sound/drivers/vx/vx_pcm.c b/sound/drivers/vx/vx_pcm.c
index 7e65a10..464109e 100644 (file)
--- a/sound/drivers/vx/vx_pcm.c
+++ b/sound/drivers/vx/vx_pcm.c
@@ -98,9 +98,10 @@ 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;
-
-       vfree(runtime->dma_area);
-       runtime->dma_area = NULL;
+       if (runtime->dma_area) {
+               vfree(runtime->dma_area);
+               runtime->dma_area = NULL;
+       }
        return 0;
 }
 
@@ -1252,14 +1253,13 @@ static int vx_init_audio_io(struct vx_core *chip)
        chip->audio_info = rmh.Stat[1];
 
        /* allocate pipes */
-       chip->playback_pipes = kcalloc(chip->audio_outs, sizeof(struct vx_pipe *), GFP_KERNEL);
-       if (!chip->playback_pipes)
+       chip->playback_pipes = kmalloc(sizeof(struct vx_pipe *) * chip->audio_outs, GFP_KERNEL);
+       chip->capture_pipes = kmalloc(sizeof(struct vx_pipe *) * chip->audio_ins, GFP_KERNEL);
+       if (! chip->playback_pipes || ! chip->capture_pipes)
                return -ENOMEM;
-       chip->capture_pipes = kcalloc(chip->audio_ins, sizeof(struct vx_pipe *), GFP_KERNEL);
-       if (!chip->capture_pipes) {
-               kfree(chip->playback_pipes);
-               return -ENOMEM;
-       }
+
+       memset(chip->playback_pipes, 0, sizeof(struct vx_pipe *) * chip->audio_outs);
+       memset(chip->capture_pipes, 0, sizeof(struct vx_pipe *) * chip->audio_ins);
 
        preferred = chip->ibl.size;
        chip->ibl.size = 0;