]> err.no Git - linux-2.6/commitdiff
[PATCH] Fixup cciss error handling
authorJens Axboe <jens.axboe@oracle.com>
Wed, 13 Dec 2006 14:44:27 +0000 (15:44 +0100)
committerJens Axboe <jens.axboe@oracle.com>
Wed, 13 Dec 2006 14:44:27 +0000 (15:44 +0100)
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>
drivers/block/cciss.c

index 335e218b6dccc2b00190ab275bc81e1d5a0ef084..2ee4a44423df162fb3104775681f548ac1f12d69 100644 (file)
@@ -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;