1 files changed, 8 insertions, 5 deletions

diff --git a/sound/drivers/vx/vx_pcm.c b/sound/drivers/vx/vx_pcm.c
index 464109e421d4..c4af84995d05 100644
--- a/sound/drivers/vx/vx_pcm.c
+++ b/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;
 }
 
@@ -1254,9 +1253,13 @@ static int vx_init_audio_io(struct vx_core *chip)
 
         /* allocate pipes */
         chip->playback_pipes = kmalloc(sizeof(struct vx_pipe *) * chip->audio_outs, GFP_KERNEL);
+        if (!chip->playback_pipes)
+                return -ENOMEM;
         chip->capture_pipes = kmalloc(sizeof(struct vx_pipe *) * chip->audio_ins, GFP_KERNEL);
-        if (! chip->playback_pipes || ! chip->capture_pipes)
+        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);