Message ID | 1289386349-29033-1-git-send-email-Frank.Li@freescale.com |
---|---|
State | New, archived |
Headers | show |
On Wed, 2010-11-10 at 18:52 +0800, Frank Li wrote: > 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 <Frank.Li@freescale.com> This patch is already in upstream.
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);
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 <Frank.Li@freescale.com> --- drivers/mtd/mtd_blkdevs.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)