UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Ryosuke Saito 2012-04-05 08:09:34 -06:00 committed by Jens Axboe
parent e9986f303d
commit 6d27f09a63
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/block/mtip32xx/mtip32xx.c
View File

@ -3605,18 +3605,25 @@ MODULE_DEVICE_TABLE(pci, mtip_pci_tbl);
*/ */
static int __init mtip_init(void) static int __init mtip_init(void)
{ {
int error;
printk(KERN_INFO MTIP_DRV_NAME " Version " MTIP_DRV_VERSION "\n"); printk(KERN_INFO MTIP_DRV_NAME " Version " MTIP_DRV_VERSION "\n");
/* Allocate a major block device number to use with this driver. */ /* Allocate a major block device number to use with this driver. */
mtip_major = register_blkdev(0, MTIP_DRV_NAME); error = register_blkdev(0, MTIP_DRV_NAME);
if (mtip_major < 0) { if (error <= 0) {
printk(KERN_ERR "Unable to register block device (%d)\n", printk(KERN_ERR "Unable to register block device (%d)\n",
mtip_major); error);
return -EBUSY; return -EBUSY;
} }
mtip_major = error;
/* Register our PCI operations. */ /* 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;
} }
/* /*