aboutsummaryrefslogtreecommitdiff
path: root/drivers/block/cciss.c
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2006-12-13 15:44:27 +0100
committerJens Axboe <jens.axboe@oracle.com>2006-12-13 15:44:27 +0100
commit2fc2c60df3d2b3a557eb8d750779def9d51934b1 (patch)
treec01576800f24494986704aa1e69c7d661de9f679 /drivers/block/cciss.c
parentc65fb61b3c92ad8f99f16c7a2c11247bfaf0a1da (diff)
[PATCH] Fixup cciss error handling
The previous cciss commit removed the err_out_disable_pdev label, but there was still a user of that. Fix that up. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/block/cciss.c')
-rw-r--r--drivers/block/cciss.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 335e218b6dc..2ee4a44423d 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -2837,7 +2837,7 @@ static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
if (err) {
printk(KERN_ERR "cciss: Cannot obtain PCI resources, "
"aborting\n");
- goto err_out_disable_pdev;
+ return err;
}
subsystem_vendor_id = pdev->subsystem_vendor;