summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>2013-11-05 12:37:00 +0100
committerJens Axboe <axboe@kernel.dk>2013-11-08 09:10:30 -0700
commit2b91c55222a0b2381e12328ca8cc60e6a823a998 (patch)
tree2a2e967d9aaef5bafad8549c7ad26deebc438d43 /drivers/block
parenta073ae953ee20b33c8463f76d563fd7e2851c0ac (diff)
downloadblackbird-obmc-linux-2b91c55222a0b2381e12328ca8cc60e6a823a998.tar.gz
blackbird-obmc-linux-2b91c55222a0b2381e12328ca8cc60e6a823a998.zip
skd: fix error paths in skd_init()
Cc: Akhil Bhansali <abhansali@stec-inc.com> Cc: Jeff Moyer <jmoyer@redhat.com> Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/skd_main.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/drivers/block/skd_main.c b/drivers/block/skd_main.c
index 6f09bca3a24f..8c96d182601d 100644
--- a/drivers/block/skd_main.c
+++ b/drivers/block/skd_main.c
@@ -5396,7 +5396,7 @@ static void skd_log_skreq(struct skd_device *skdev,
static int __init skd_init(void)
{
- int rc = 0;
+ int rc = -ENOMEM;
pr_info(PFX " v%s-b%s loaded\n", DRV_VERSION, DRV_BUILD_ID);
@@ -5454,11 +5454,21 @@ static int __init skd_init(void)
/* Obtain major device number. */
rc = register_blkdev(0, DRV_NAME);
if (rc < 0)
- return rc;
+ goto err_register_blkdev;
skd_major = rc;
- return pci_register_driver(&skd_driver);
+ rc = pci_register_driver(&skd_driver);
+ if (rc < 0)
+ goto err_pci_register_driver;
+
+ return rc;
+
+err_pci_register_driver:
+ unregister_blkdev(skd_major, DRV_NAME);
+
+err_register_blkdev:
+ return rc;
}
static void __exit skd_exit(void)
OpenPOWER on IntegriCloud