From: Jens Axboe <jens.axboe@oracle.com>
Date: Wed, 13 Dec 2006 14:44:27 +0000 (+0100)
Subject: [PATCH] Fixup cciss error handling
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2fc2c60df3d2b3a557eb8d750779def9d51934b1;p=linux-beck.git

[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>
---

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 335e218b6dcc..2ee4a44423df 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;