Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753760AbaAWTvx (ORCPT ); Thu, 23 Jan 2014 14:51:53 -0500 Received: from mailrelay010.isp.belgacom.be ([195.238.6.177]:58871 "EHLO mailrelay010.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751560AbaAWTvv (ORCPT ); Thu, 23 Jan 2014 14:51:51 -0500 X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AkcNAHhx4VJR8dUw/2dsb2JhbABagww4pzgDlVKBExd0glMTHCMYgQI3iAkBxwYXjQWBex2EIgSYIgGKTodKgy47 Date: Thu, 23 Jan 2014 20:51:47 +0100 From: Fabian Frederick To: linux-mtd@lists.infradead.org Cc: akpm@linux-foundation.org, rdunlap@infradead.org, joern@lazybastard.org, linux-kernel@vger.kernel.org, ezequiel.garcia@free-electrons.com Subject: [PATCH 2/4] mtd: block2mtd: Add mutex_destroy Message-Id: <20140123205147.943d63fecf3140aa6cc76994@skynet.be> X-Mailer: Sylpheed 3.2.0beta5 (GTK+ 2.24.10; i686-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org mutex_destroy added on each device in block2mtd_exit and add_device failure Signed-off-by: Fabian Frederick --- drivers/mtd/devices/block2mtd.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c index 0efee5b..8071596 100644 --- a/drivers/mtd/devices/block2mtd.c +++ b/drivers/mtd/devices/block2mtd.c @@ -240,14 +240,14 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size) if (IS_ERR(bdev)) { pr_err("error: cannot open device %s\n", devname); - goto devinit_err; + goto devinit_err1; } dev->blkdev = bdev; if ((MAJOR(bdev->bd_dev) == MTD_BLOCK_MAJOR) || (MAJOR(bdev->bd_dev) == MTD_CHAR_MAJOR)) { pr_err("attempting to use an MTD device as a block device\n"); - goto devinit_err; + goto devinit_err1; } mutex_init(&dev->write_mutex); @@ -256,7 +256,7 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size) /* make the name contain the block device in */ name = kasprintf(GFP_KERNEL, "block2mtd: %s", devname); if (!name) - goto devinit_err; + goto devinit_err2; dev->mtd.name = name; @@ -275,7 +275,7 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size) if (mtd_device_register(&dev->mtd, NULL, 0)) { /* Device didn't get added, so free the entry */ - goto devinit_err; + goto devinit_err2; } list_add(&dev->list, &blkmtd_device_list); pr_info("mtd%d: [%s] erase_size = %dKiB [%d]\n", @@ -284,7 +284,9 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size) dev->mtd.erasesize >> 10, dev->mtd.erasesize); return dev; -devinit_err: +devinit_err2: + mutex_destroy(&dev->write_mutex); +devinit_err1: block2mtd_free_device(dev); return NULL; } @@ -449,6 +451,7 @@ static void block2mtd_exit(void) struct block2mtd_dev *dev = list_entry(pos, typeof(*dev), list); block2mtd_sync(&dev->mtd); mtd_device_unregister(&dev->mtd); + mutex_destroy(&dev->write_mutex); pr_info("mtd%d: [%s] removed\n", dev->mtd.index, dev->mtd.name + strlen("block2mtd: ")); -- 1.8.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/