From patchwork Thu Jan 23 19:54:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 313697 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46A6A2C009E for ; Fri, 24 Jan 2014 06:55:31 +1100 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W6QN1-000270-3H; Thu, 23 Jan 2014 19:55:23 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W6QMz-0003d5-Fo; Thu, 23 Jan 2014 19:55:21 +0000 Received: from mailrelay010.isp.belgacom.be ([195.238.6.177]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W6QMx-0003bR-6H for linux-mtd@lists.infradead.org; Thu, 23 Jan 2014 19:55:19 +0000 X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Am0NAJ5y4VJR8dUw/2dsb2JhbABagww4ggqBC6QjA5VSgRMXdIJTExwjGIECN4gJAccAF40FgXsdhCIEmCIBik6HSoMuOw Received: from 48.213-241-81.adsl-dyn.isp.belgacom.be (HELO hplaser1) ([81.241.213.48]) by relay.skynet.be with SMTP; 23 Jan 2014 20:54:56 +0100 Date: Thu, 23 Jan 2014 20:54:56 +0100 From: Fabian Frederick To: linux-mtd@lists.infradead.org Subject: [PATCH 4/4] mtd: block2mtd: mutex_init moved Message-Id: <20140123205456.10e45ea0baff94cf3f785a21@skynet.be> X-Mailer: Sylpheed 3.2.0beta5 (GTK+ 2.24.10; i686-pc-linux-gnu) Mime-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140123_145519_368745_D9B7B3BD X-CRM114-Status: UNSURE ( 8.72 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [195.238.6.177 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: akpm@linux-foundation.org, rdunlap@infradead.org, joern@lazybastard.org, linux-kernel@vger.kernel.org, ezequiel.garcia@free-electrons.com X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org mutex_init declared when mtd structure is available Signed-off-by: Fabian Frederick --- drivers/mtd/devices/block2mtd.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c index f0fd4fc..5b9b145 100644 --- a/drivers/mtd/devices/block2mtd.c +++ b/drivers/mtd/devices/block2mtd.c @@ -254,16 +254,15 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size) goto devinit_err1; } + name = kasprintf(GFP_KERNEL, "block2mtd: %s", devname); + if (!name) + goto devinit_err1; + mutex_init(&dev->write_mutex); /* Setup the MTD structure */ /* make the name contain the block device in */ - name = kasprintf(GFP_KERNEL, "block2mtd: %s", devname); - if (!name) - goto devinit_err2; - dev->mtd.name = name; - dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK; dev->mtd.erasesize = erase_size; dev->mtd.writesize = 1;