Commit ca945e71 authored by NeilBrown's avatar NeilBrown Committed by Linus Torvalds

memstick: don't allocate unused major for ms_block

When alloc_disk(0) is used the ->major number is completely ignored.
All devices are allocated with a major of BLOCK_EXT_MAJOR.

So remove registration and deregistration of 'major'.

Link: default avatarNeilBrown <>
Cc: Keith Busch <>
Cc: Jens Axboe <>
Cc: Maxim Levitsky <>
Cc: Greg Kroah-Hartman <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent bc083a64
......@@ -2338,23 +2338,11 @@ static struct memstick_driver msb_driver = {
.resume = msb_resume
static int major;
static int __init msb_init(void)
int rc = register_blkdev(0, DRIVER_NAME);
if (rc < 0) {
pr_err("failed to register major (error %d)\n", rc);
return rc;
major = rc;
rc = memstick_register_driver(&msb_driver);
if (rc) {
unregister_blkdev(major, DRIVER_NAME);
int rc = memstick_register_driver(&msb_driver);
if (rc)
pr_err("failed to register memstick driver (error %d)\n", rc);
return rc;
......@@ -2362,7 +2350,6 @@ static int __init msb_init(void)
static void __exit msb_exit(void)
unregister_blkdev(major, DRIVER_NAME);
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment