diff --git a/[refs] b/[refs]
index db1c14b39cad..e41273335637 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c65fb61b3c92ad8f99f16c7a2c11247bfaf0a1da
+refs/heads/master: 2fc2c60df3d2b3a557eb8d750779def9d51934b1
diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c
index 335e218b6dcc..2ee4a44423df 100644
--- a/trunk/drivers/block/cciss.c
+++ b/trunk/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;