From f951c8b5d4056645d8f74a14f03ef83681e5a1f5 Mon Sep 17 00:00:00 2001
From: Mark Haverkamp <markh@osdl.org>
Date: Mon, 27 Mar 2006 09:44:11 -0800
Subject: [PATCH] --- yaml --- r: 25791 b: refs/heads/master c:
 e61b17fd3ae270c0ca83d12c8276b73e50466db9 h: refs/heads/master i:   25789:
 92bf632733544bee50fb3dec9fa5bae9ea99533c   25787:
 4f9e4c4366c06ab7ec3010020d3238526973cae1   25783:
 cfb1ee6f1d83d4f5f6baaca9316bbcc765a91368   25775:
 3d67e490a8feb38ccfab80f2bcfbc83794df407c   25759:
 d50c085042294c83d28f5645ead88fd76b2c3a42   25727:
 a3c4671400f8c4c064d59f0c8e28d37f75b6158b v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/scsi/aacraid/linit.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index dc88470779da..09419394e9d7 100644
--- 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
index 9f3cc7b7123d..78c82f774535 100644
--- a/trunk/drivers/scsi/aacraid/linit.c
+++ b/trunk/drivers/scsi/aacraid/linit.c
@@ -800,10 +800,11 @@ 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
@@ -811,7 +812,7 @@ static int __devinit aac_probe_one(struct pci_dev *pdev,
 	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);