summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyosuke Saito <raitosyo@gmail.com>2012-04-05 08:09:34 -0600
committerJens Axboe <axboe@kernel.dk>2012-04-05 08:09:34 -0600
commit6d27f09a6398ee086b11804aa3a16609876f0c7c (patch)
tree2303eacd5a35acec2d94cb0c2f25121e15acee9d
parente9986f303dc0f285401de28cf96f42f4dd23a4a1 (diff)
downloadlinux-6d27f09a6398ee086b11804aa3a16609876f0c7c.tar.gz
linux-6d27f09a6398ee086b11804aa3a16609876f0c7c.tar.bz2
linux-6d27f09a6398ee086b11804aa3a16609876f0c7c.zip
mtip32xx: fix error handling in mtip_init()
Ensure that block device is properly unregistered, if pci_register_driver() fails. Signed-off-by: Ryosuke Saito <raitosyo@gmail.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r--drivers/block/mtip32xx/mtip32xx.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
index 04f69e6da1fe..c37073ddf7d4 100644
--- a/drivers/block/mtip32xx/mtip32xx.c
+++ b/drivers/block/mtip32xx/mtip32xx.c
@@ -3605,18 +3605,25 @@ MODULE_DEVICE_TABLE(pci, mtip_pci_tbl);
*/
static int __init mtip_init(void)
{
+ int error;
+
printk(KERN_INFO MTIP_DRV_NAME " Version " MTIP_DRV_VERSION "\n");
/* Allocate a major block device number to use with this driver. */
- mtip_major = register_blkdev(0, MTIP_DRV_NAME);
- if (mtip_major < 0) {
+ error = register_blkdev(0, MTIP_DRV_NAME);
+ if (error <= 0) {
printk(KERN_ERR "Unable to register block device (%d)\n",
- mtip_major);
+ error);
return -EBUSY;
}
+ mtip_major = error;
/* Register our PCI operations. */
- return pci_register_driver(&mtip_pci_driver);
+ error = pci_register_driver(&mtip_pci_driver);
+ if (error)
+ unregister_blkdev(mtip_major, MTIP_DRV_NAME);
+
+ return error;
}
/*