---

yaml --- r: 25791 b: refs/heads/master c: e61b17f h: refs/heads/master i: 25789: 92bf632 25787: 4f9e4c4 25783: cfb1ee6 25775: 3d67e49 25759: d50c085 25727: a3c4671 v: v3
git-mirror · Apr 13, 2006 · f951c8b · f951c8b
1 parent 2ec071a
commit f951c8b
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: 31876f328f22435c21cfc27f0c871a4a4b22f9db
+refs/heads/master: e61b17fd3ae270c0ca83d12c8276b73e50466db9
diff --git a/trunk/drivers/scsi/aacraid/linit.c b/trunk/drivers/scsi/aacraid/linit.c
@@ -800,18 +800,19 @@ static int __devinit aac_probe_one(struct pci_dev *pdev,
 	error = pci_enable_device(pdev);
 	if (error)
 		goto out;
+	error = -ENODEV;
 
 	if (pci_set_dma_mask(pdev, DMA_32BIT_MASK) || 
 			pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK))
-		goto out;
+		goto out_disable_pdev;
 	/*
 	 * If the quirk31 bit is set, the adapter needs adapter
 	 * to driver communication memory to be allocated below 2gig
 	 */
 	if (aac_drivers[index].quirks & AAC_QUIRK_31BIT) 
 		if (pci_set_dma_mask(pdev, DMA_31BIT_MASK) ||
 				pci_set_consistent_dma_mask(pdev, DMA_31BIT_MASK))
-			goto out;
+			goto out_disable_pdev;
 
 	pci_set_master(pdev);