Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d27f09a authored by Ryosuke Saito's avatar Ryosuke Saito Committed by Jens Axboe
Browse files

mtip32xx: fix error handling in mtip_init() 



Ensure that block device is properly unregistered, if
pci_register_driver() fails.

Signed-off-by: default avatarRyosuke Saito <raitosyo@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent e9986f30

drivers/block/mtip32xx/mtip32xx.c

+11 −4
Original line number Diff line number Diff line
@@ -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;

}



/*