From patchwork Tue Oct 26 03:02:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 69158 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from canuck.infradead.org (canuck.infradead.org [134.117.69.58]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3EF81B70A9 for ; Tue, 26 Oct 2010 13:58:28 +1100 (EST) Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1PAZiv-0007UV-0j; Tue, 26 Oct 2010 02:57:17 +0000 Received: from am1ehsobe006.messaging.microsoft.com ([213.199.154.209] helo=AM1EHSOBE006.bigfish.com) by canuck.infradead.org with esmtps (Exim 4.72 #1 (Red Hat Linux)) id 1PAZir-0007Th-9u for linux-mtd@lists.infradead.org; Tue, 26 Oct 2010 02:57:14 +0000 Received: from mail61-am1-R.bigfish.com (10.3.201.250) by AM1EHSOBE006.bigfish.com (10.3.204.26) with Microsoft SMTP Server id 14.1.225.8; Tue, 26 Oct 2010 02:57:10 +0000 Received: from mail61-am1 (localhost.localdomain [127.0.0.1]) by mail61-am1-R.bigfish.com (Postfix) with ESMTP id 88F4215E81C9 for ; Tue, 26 Oct 2010 02:57:10 +0000 (UTC) X-SpamScore: -3 X-BigFish: VS-3(zzbb2cKzz1202hzz8275bhz2dh2a8h62h) X-Spam-TCS-SCL: 1:0 X-Forefront-Antispam-Report: KIP:(null); UIP:(null); IPVD:NLI; H:de01egw02.freescale.net; RD:de01egw02.freescale.net; EFVD:NLI Received: from mail61-am1 (localhost.localdomain [127.0.0.1]) by mail61-am1 (MessageSwitch) id 1288061830129028_23737; Tue, 26 Oct 2010 02:57:10 +0000 (UTC) Received: from AM1EHSMHS002.bigfish.com (unknown [10.3.201.250]) by mail61-am1.bigfish.com (Postfix) with ESMTP id 1E2C7E90050 for ; Tue, 26 Oct 2010 02:57:10 +0000 (UTC) Received: from de01egw02.freescale.net (192.88.165.103) by AM1EHSMHS002.bigfish.com (10.3.207.102) with Microsoft SMTP Server (TLS) id 14.1.225.8; Tue, 26 Oct 2010 02:57:08 +0000 Received: from de01smr01.freescale.net (de01smr01.freescale.net [10.208.0.31]) by de01egw02.freescale.net (8.14.3/8.14.3) with ESMTP id o9Q2v7Oj024155 for ; Mon, 25 Oct 2010 19:57:07 -0700 (MST) Received: from shlinux1.ap.freescale.net (shlinux1.ap.freescale.net [10.192.225.216]) by de01smr01.freescale.net (8.13.1/8.13.0) with ESMTP id o9Q3CfCV022885 for ; Mon, 25 Oct 2010 22:12:42 -0500 (CDT) Received: by shlinux1.ap.freescale.net (Postfix, from userid 1013) id A1E124D6001; Tue, 26 Oct 2010 11:02:20 +0800 (CST) From: Frank Li To: Subject: [PATCH 1/1] MTD: Fix wrong check register_blkdev return value Date: Tue, 26 Oct 2010 11:02:19 +0800 Message-ID: <1288062139-2192-1-git-send-email-Frank.Li@freescale.com> X-Mailer: git-send-email 1.6.3.3 MIME-Version: 1.0 X-OriginatorOrg: freescale.net X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20101025_225713_569794_193D64EF X-CRM114-Status: GOOD ( 10.54 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [213.199.154.209 listed in list.dnswl.org] Cc: Frank Li X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org register_blkdev return 1..255 when major = 0. if (ret ) { printk(KERN_WARNING "Unable to register %s block device on major %d: %d\n", tr->name, tr->major, ret); mutex_unlock(&mtd_table_mutex); return ret; } Above code will return fail when register_blkdev return allocated major number. Signed-off-by: Frank Li --- drivers/mtd/mtd_blkdevs.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c index a919587..63790e9 100644 --- a/drivers/mtd/mtd_blkdevs.c +++ b/drivers/mtd/mtd_blkdevs.c @@ -502,13 +502,16 @@ int register_mtd_blktrans(struct mtd_blktrans_ops *tr) mutex_lock(&mtd_table_mutex); ret = register_blkdev(tr->major, tr->name); - if (ret) { + if (ret < 0) { printk(KERN_WARNING "Unable to register %s block device on major %d: %d\n", tr->name, tr->major, ret); mutex_unlock(&mtd_table_mutex); return ret; } + if (ret) + tr->major = ret; + tr->blkshift = ffs(tr->blksize) - 1; INIT_LIST_HEAD(&tr->devs);