diff options
| author | Frank Li <Frank.Li@freescale.com> | 2010-10-25 10:53:48 +0800 |
|---|---|---|
| committer | Frank Li <Frank.Li@freescale.com> | 2010-11-03 09:22:18 +0800 |
| commit | 64dcd3ea7681bfa32f714b29dd0cce18eaad7c00 (patch) | |
| tree | 22d9924d34a22acfb820853cfe9edfa3913abce2 | |
| parent | 85202dce946013054ce2dc807ef4768cbb8691bd (diff) | |
ENGR00131983-1 MTD: Fix wrong check register_blkdev return value
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: Patrick Turley <patrick.turley@freescale.com>
Signed-off-by: Frank Li <Frank.Li@freescale.com>
| -rw-r--r-- | 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 03e19c1965cc..39f48524e986 100644 --- a/drivers/mtd/mtd_blkdevs.c +++ b/drivers/mtd/mtd_blkdevs.c @@ -485,13 +485,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); |