aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorStephen M. Cameron <scameron@beardog.cce.hp.com>2009-09-17 14:47:24 -0400
committerJens Axboe <jens.axboe@oracle.com>2009-10-01 15:15:42 -0400
commite8074f79770953be26b64539803d06a46d1a6e58 (patch)
tree0b6cd25f5ce125182f7248bd1b4b55c64bfc4502 /drivers
parent097d026453e7051a544722f4e05240085916499d (diff)
cciss: Handle failure of blk_init_queue gracefully in cciss_add_disk.
Handle failure of blk_init_queue gracefully in cciss_add_disk. Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/block/cciss.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 2810dd9805a9..b1211d530dae 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -1690,6 +1690,8 @@ static int cciss_add_disk(ctlr_info_t *h, struct gendisk *disk,
1690 int drv_index) 1690 int drv_index)
1691{ 1691{
1692 disk->queue = blk_init_queue(do_cciss_request, &h->lock); 1692 disk->queue = blk_init_queue(do_cciss_request, &h->lock);
1693 if (!disk->queue)
1694 goto init_queue_failure;
1693 sprintf(disk->disk_name, "cciss/c%dd%d", h->ctlr, drv_index); 1695 sprintf(disk->disk_name, "cciss/c%dd%d", h->ctlr, drv_index);
1694 disk->major = h->major; 1696 disk->major = h->major;
1695 disk->first_minor = drv_index << NWD_SHIFT; 1697 disk->first_minor = drv_index << NWD_SHIFT;
@@ -1730,6 +1732,7 @@ static int cciss_add_disk(ctlr_info_t *h, struct gendisk *disk,
1730cleanup_queue: 1732cleanup_queue:
1731 blk_cleanup_queue(disk->queue); 1733 blk_cleanup_queue(disk->queue);
1732 disk->queue = NULL; 1734 disk->queue = NULL;
1735init_queue_failure:
1733 return -1; 1736 return -1;
1734} 1737}
1735 1738