From patchwork Wed Nov 10 10:52:29 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 70621 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 04972B70F4 for ; Wed, 10 Nov 2010 21:39:37 +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 1PG82z-0005qd-10; Wed, 10 Nov 2010 10:36:57 +0000 Received: from tx2ehsobe004.messaging.microsoft.com ([65.55.88.14] helo=TX2EHSOBE007.bigfish.com) by canuck.infradead.org with esmtps (Exim 4.72 #1 (Red Hat Linux)) id 1PG82v-0005qL-Ee for linux-mtd@lists.infradead.org; Wed, 10 Nov 2010 10:36:55 +0000 Received: from mail45-tx2-R.bigfish.com (10.9.14.246) by TX2EHSOBE007.bigfish.com (10.9.40.27) with Microsoft SMTP Server id 14.1.225.8; Wed, 10 Nov 2010 10:36:50 +0000 Received: from mail45-tx2 (localhost.localdomain [127.0.0.1]) by mail45-tx2-R.bigfish.com (Postfix) with ESMTP id 60A69970400 for ; Wed, 10 Nov 2010 10:36:50 +0000 (UTC) X-SpamScore: -3 X-BigFish: VS-3(zzbb2cKzz1202hzz8275bhz2dh2a8h668h65h) X-Spam-TCS-SCL: 4:0 X-Forefront-Antispam-Report: KIP:(null); UIP:(null); IPVD:NLI; H:az33egw01.freescale.net; RD:az33egw01.freescale.net; EFVD:NLI Received: from mail45-tx2 (localhost.localdomain [127.0.0.1]) by mail45-tx2 (MessageSwitch) id 1289385409992806_19746; Wed, 10 Nov 2010 10:36:49 +0000 (UTC) Received: from TX2EHSMHS014.bigfish.com (unknown [10.9.14.242]) by mail45-tx2.bigfish.com (Postfix) with ESMTP id EFEC46A8052 for ; Wed, 10 Nov 2010 10:36:49 +0000 (UTC) Received: from az33egw01.freescale.net (192.88.158.102) by TX2EHSMHS014.bigfish.com (10.9.99.114) with Microsoft SMTP Server (TLS) id 14.1.225.8; Wed, 10 Nov 2010 10:36:15 +0000 Received: from az33smr01.freescale.net (az33smr01.freescale.net [10.64.34.199]) by az33egw01.freescale.net (8.14.3/8.14.3) with ESMTP id oAAAaE87022954 for ; Wed, 10 Nov 2010 03:36:14 -0700 (MST) Received: from shlinux (shlinux.ap.freescale.net [10.192.224.203]) by az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id oAAAaDW1015722 for ; Wed, 10 Nov 2010 04:36:14 -0600 (CST) Received: by shlinux (Postfix, from userid 1019) id 93D1611EA5DB; Wed, 10 Nov 2010 18:52:30 +0800 (CST) From: Frank Li To: Subject: [PATCH 1/1] [MTD]:CORE Fix wrong check register_blkdev return value Date: Wed, 10 Nov 2010 18:52:29 +0800 Message-ID: <1289386349-29033-1-git-send-email-Frank.Li@freescale.com> X-Mailer: git-send-email 1.7.1 MIME-Version: 1.0 X-OriginatorOrg: freescale.net X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20101110_053653_652860_C740DD3B X-CRM114-Status: GOOD ( 11.98 ) 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 [65.55.88.14 listed in list.dnswl.org] Cc: Frank Li , dwmw2@infradead.org, linux-kernel.vger.kernel.org@shlinux.ap.freescale.net 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);