From patchwork Tue Nov 18 07:33:16 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan Wu X-Patchwork-Id: 9374 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [18.85.46.34]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3CC6DDDDEE for ; Tue, 18 Nov 2008 19:05:06 +1100 (EST) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.68 #1 (Red Hat Linux)) id 1L2LXv-0004BX-Kr; Tue, 18 Nov 2008 08:02:51 +0000 Received: from nwd2mail11.analog.com ([137.71.25.57]) by bombadil.infradead.org with esmtp (Exim 4.68 #1 (Red Hat Linux)) id 1L2L3v-0006iz-No for linux-mtd@lists.infradead.org; Tue, 18 Nov 2008 07:31:52 +0000 X-IronPort-AV: E=Sophos;i="4.33,624,1220241600"; d="scan'208";a="62689566" Received: from nwd2mhb2.analog.com ([137.71.6.12]) by nwd2mail11.analog.com with ESMTP; 18 Nov 2008 02:31:51 -0500 Received: from sdc1.sdcdesign.analog.com (sdc1.sdcdesign.analog.com [10.99.22.250]) by nwd2mhb2.analog.com (8.9.3 (PHNE_28810+JAGae91741)/8.9.3) with ESMTP id CAA21414; Tue, 18 Nov 2008 02:31:51 -0500 (EST) Received: from localhost.localdomain ([10.99.29.110]) by sdc1.sdcdesign.analog.com (8.11.7p1+Sun/8.11.7) with ESMTP id mAI7VlH08389; Tue, 18 Nov 2008 15:31:47 +0800 (CST) From: Bryan Wu To: dwmw2@infradead.org, linux-mtd@lists.infradead.org Subject: [PATCH 1/2] mtd/maps: blackfin async flash maps - fix bug: dont leak resources when initializing in case of errors Date: Tue, 18 Nov 2008 15:33:16 +0800 Message-Id: <1226993597-31998-2-git-send-email-cooloney@kernel.org> X-Mailer: git-send-email 1.5.6.3 In-Reply-To: <1226993597-31998-1-git-send-email-cooloney@kernel.org> References: <1226993597-31998-1-git-send-email-cooloney@kernel.org> X-Bad-Reply: References and In-Reply-To but no 'Re:' in Subject. X-Spam-Score: 0.0 (/) X-Mailman-Approved-At: Tue, 18 Nov 2008 03:02:50 -0500 Cc: Bryan Wu , linux-kernel@vger.kernel.org, Mike Frysinger X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.9 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Mike Frysinger Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu --- drivers/mtd/maps/bfin-async-flash.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/drivers/mtd/maps/bfin-async-flash.c b/drivers/mtd/maps/bfin-async-flash.c index 6fec86a..576611f 100644 --- a/drivers/mtd/maps/bfin-async-flash.c +++ b/drivers/mtd/maps/bfin-async-flash.c @@ -152,14 +152,18 @@ static int __devinit bfin_flash_probe(struct platform_device *pdev) if (gpio_request(state->enet_flash_pin, DRIVER_NAME)) { pr_devinit(KERN_ERR DRIVER_NAME ": Failed to request gpio %d\n", state->enet_flash_pin); + kfree(state); return -EBUSY; } gpio_direction_output(state->enet_flash_pin, 1); pr_devinit(KERN_NOTICE DRIVER_NAME ": probing %d-bit flash bus\n", state->map.bankwidth * 8); state->mtd = do_map_probe(memory->name, &state->map); - if (!state->mtd) + if (!state->mtd) { + gpio_free(state->enet_flash_pin); + kfree(state); return -ENXIO; + } #ifdef CONFIG_MTD_PARTITIONS ret = parse_mtd_partitions(state->mtd, part_probe_types, &pdata->parts, 0);