From 7b197cc07d75cc69aa01939b6e571d06214061d5 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 15 Jan 2013 17:42:15 +0100 Subject: [PATCH] --- yaml --- r: 353269 b: refs/heads/master c: 549e8292a1e7712d401cc8b8df88286cdfff9f08 h: refs/heads/master i: 353267: 8316cd5255312a2789b68ffee8974ef3002889ee v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/patch_ca0132.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 0c81f78abe6a..027341b38f22 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 425a7880e804f6147b520aecee522e4172c98e83 +refs/heads/master: 549e8292a1e7712d401cc8b8df88286cdfff9f08 diff --git a/trunk/sound/pci/hda/patch_ca0132.c b/trunk/sound/pci/hda/patch_ca0132.c index f6c949039cab..ee2b9c6600ff 100644 --- a/trunk/sound/pci/hda/patch_ca0132.c +++ b/trunk/sound/pci/hda/patch_ca0132.c @@ -2416,15 +2416,13 @@ static int dspxfr_image(struct hda_codec *codec, return -EINVAL; dma_engine = kzalloc(sizeof(*dma_engine), GFP_KERNEL); - if (!dma_engine) { - status = -ENOMEM; - goto exit; - } + if (!dma_engine) + return -ENOMEM; dma_engine->dmab = kzalloc(sizeof(*dma_engine->dmab), GFP_KERNEL); if (!dma_engine->dmab) { - status = -ENOMEM; - goto exit; + kfree(dma_engine); + return -ENOMEM; } dma_engine->codec = codec;