From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964813Ab0GPJ0M (ORCPT ); Fri, 16 Jul 2010 05:26:12 -0400 Received: from mail-iw0-f174.google.com ([209.85.214.174]:52791 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936078Ab0GPJ0K (ORCPT ); Fri, 16 Jul 2010 05:26:10 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; b=t+x1SJ36N4tivP4lNey6OACL7o0vmgrQtm+zB8MxSell7pp0i9i43V+I+MrWxIICi5 EjG1nKPsFAYTor/9DtCxXk2Tu7i6S0rVOzrXFocJh9kVuKqsPlDnGe+0spa/uJ7uxQOC AVGAqy7DRBU1nJE7AWxtFkICwiAuMwDLujIqk= Subject: [PATCH] twl6040: fix wrong kfree in twl6040_remove and twl6040_codec_remove From: Axel Lin To: linux-kernel Cc: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Margarita Olaya Cabrera , Jorge Eduardo Candelaria , alsa-devel@alsa-project.org Content-Type: text/plain Date: Fri, 16 Jul 2010 17:26:48 +0800 Message-Id: <1279272408.2594.1.camel@mola> Mime-Version: 1.0 X-Mailer: Evolution 2.22.3.1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Memory allocation part: We allocate a memory in twl6040_codec_probe(): priv = kzalloc(sizeof(struct twl6040_data), GFP_KERNEL); twl6040_codec = codec = &priv->codec; Memory release part: In twl6040_codec_remove() we should kfree(priv) instead of kfree(twl6040_codec). In twl6040_remove(), no need and should not kfree(codec). Signed-off-by: Axel Lin --- sound/soc/codecs/twl6040.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c index af36346..9d4a85f 100644 --- a/sound/soc/codecs/twl6040.c +++ b/sound/soc/codecs/twl6040.c @@ -1068,7 +1068,6 @@ static int twl6040_remove(struct platform_device *pdev) twl6040_set_bias_level(codec, SND_SOC_BIAS_OFF); snd_soc_free_pcms(socdev); snd_soc_dapm_free(socdev); - kfree(codec); return 0; } @@ -1214,7 +1213,7 @@ static int __devexit twl6040_codec_remove(struct platform_device *pdev) snd_soc_unregister_dai(&twl6040_dai); snd_soc_unregister_codec(twl6040_codec); - kfree(twl6040_codec); + kfree(priv); twl6040_codec = NULL; return 0; -- 1.5.4.3