---

yaml --- r: 167441 b: refs/heads/master c: 2cfa948 h: refs/heads/master i: 167439: 24951ee v: v3
git-mirror · Oct 13, 2009 · b9df1ef · b9df1ef
1 parent fcc7967
commit b9df1ef
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7ebf0657b1f47d85aee8349ed6345d940d7232a
+refs/heads/master: 2cfa948c9ea8681e831743a3bb61157f590fa8d8
diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c
@@ -4254,7 +4254,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
 	mutex_init(&hba[i]->busy_shutting_down);
 
 	if (cciss_pci_init(hba[i], pdev) != 0)
-		goto clean0;
+		goto clean_no_release_regions;
 
 	sprintf(hba[i]->devname, "cciss%d", i);
 	hba[i]->ctlr = i;
@@ -4391,13 +4391,14 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
 clean1:
 	cciss_destroy_hba_sysfs_entry(hba[i]);
 clean0:
+	pci_release_regions(pdev);
+clean_no_release_regions:
 	hba[i]->busy_initializing = 0;
 
 	/*
 	 * Deliberately omit pci_disable_device(): it does something nasty to
 	 * Smart Array controllers that pci_enable_device does not undo
 	 */
-	pci_release_regions(pdev);
 	pci_set_drvdata(pdev, NULL);
 	free_hba(i);
 	return -1;