From patchwork Wed Mar 27 12:25:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zang Roy-R61911 X-Patchwork-Id: 231590 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 98A142C0136 for ; Wed, 27 Mar 2013 15:26:48 +1100 (EST) Received: from ch1outboundpool.messaging.microsoft.com (ch1ehsobe003.messaging.microsoft.com [216.32.181.183]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (Client CN "mail.global.frontbridge.com", Issuer "Microsoft Secure Server Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 23F9D2C00A1 for ; Wed, 27 Mar 2013 15:26:17 +1100 (EST) Received: from mail135-ch1-R.bigfish.com (10.43.68.230) by CH1EHSOBE008.bigfish.com (10.43.70.58) with Microsoft SMTP Server id 14.1.225.23; Wed, 27 Mar 2013 04:26:10 +0000 Received: from mail135-ch1 (localhost [127.0.0.1]) by mail135-ch1-R.bigfish.com (Postfix) with ESMTP id 960F5400D6; Wed, 27 Mar 2013 04:26:10 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 0 X-BigFish: VS0(zzzz1f42h1ee6h1de0h1202h1e76h1d1ah1d2ahzz8275bhz2dh2a8h668h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1155h) Received: from mail135-ch1 (localhost.localdomain [127.0.0.1]) by mail135-ch1 (MessageSwitch) id 1364358368609897_9873; Wed, 27 Mar 2013 04:26:08 +0000 (UTC) Received: from CH1EHSMHS038.bigfish.com (snatpool2.int.messaging.microsoft.com [10.43.68.234]) by mail135-ch1.bigfish.com (Postfix) with ESMTP id 8058E4C007E; Wed, 27 Mar 2013 04:26:08 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CH1EHSMHS038.bigfish.com (10.43.69.247) with Microsoft SMTP Server (TLS) id 14.1.225.23; Wed, 27 Mar 2013 04:26:08 +0000 Received: from az84smr01.freescale.net (10.64.34.197) by 039-SN1MMR1-003.039d.mgd.msft.net (10.84.1.16) with Microsoft SMTP Server (TLS) id 14.2.328.11; Wed, 27 Mar 2013 04:26:07 +0000 Received: from Dell64.ap.freescale.net (Dell64.ap.freescale.net [10.193.20.81]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id r2R4Pqx8016743; Tue, 26 Mar 2013 21:25:55 -0700 From: Roy Zang To: Subject: [upstream] mtd/ifc: fix ifc driver memory release issue Date: Wed, 27 Mar 2013 20:25:00 +0800 Message-ID: <1364387100-23013-1-git-send-email-tie-fei.zang@freescale.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 X-OriginatorOrg: freescale.com Cc: Li Hao , scottwood@freescale.com, linuxppc-dev@lists.ozlabs.org, dwmw2@infradead.org, Cao Yonghua X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" memory is allocated by devm_kzalloc, so release it using devm_kfree() instead kfree(); Signed-off-by: Li Hao Signed-off-by: Cao Yonghua Signed-off-by: Roy Zang --- drivers/mtd/nand/fsl_ifc_nand.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/nand/fsl_ifc_nand.c b/drivers/mtd/nand/fsl_ifc_nand.c index f1f7f12..b574ca4 100644 --- a/drivers/mtd/nand/fsl_ifc_nand.c +++ b/drivers/mtd/nand/fsl_ifc_nand.c @@ -908,7 +908,7 @@ static int fsl_ifc_chip_remove(struct fsl_ifc_mtd *priv) ifc_nand_ctrl->chips[priv->bank] = NULL; dev_set_drvdata(priv->dev, NULL); - kfree(priv); + devm_kfree(priv->dev, priv); return 0; } @@ -974,6 +974,7 @@ static int fsl_ifc_nand_probe(struct platform_device *dev) if (!ifc_nand_ctrl) { dev_err(&dev->dev, "failed to allocate memory\n"); mutex_unlock(&fsl_ifc_nand_mutex); + devm_kfree(&dev->dev, priv); return -ENOMEM; }