From eb16bcd851b551529b8b7ffa3d4a307f887ede3f Mon Sep 17 00:00:00 2001
From: "Salyzyn, Mark" <mark_salyzyn@adaptec.com>
Date: Thu, 2 Aug 2007 15:38:59 -0400
Subject: [PATCH] --- yaml --- r: 63695 b: refs/heads/master c:
 2b053729a84b6aac197df51b8729bc9fec743bff h: refs/heads/master i:   63693:
 8114b6a830007cf7c30530426388c036295c91c4   63691:
 2461779ff80d5388e66a2cd7519af98c14033f2a   63687:
 f807b79764efc30a53d972790af823d39ffae8c5   63679:
 56fc17251a0c4f471fd1f974eb97d4b900f02204 v: v3

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

diff --git a/[refs] b/[refs]
index 13aac4e8c3a2..63eb8e228ed8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2338545aafbecce55bbc651fb3f63ebf7468b6fb
+refs/heads/master: 2b053729a84b6aac197df51b8729bc9fec743bff
diff --git a/trunk/drivers/scsi/aacraid/linit.c b/trunk/drivers/scsi/aacraid/linit.c
index 813556c60007..a7f42a17b5c7 100644
--- a/trunk/drivers/scsi/aacraid/linit.c
+++ b/trunk/drivers/scsi/aacraid/linit.c
@@ -1110,7 +1110,9 @@ static int __devinit aac_probe_one(struct pci_dev *pdev,
 	__aac_shutdown(aac);
  out_unmap:
 	aac_fib_map_free(aac);
-	pci_free_consistent(aac->pdev, aac->comm_size, aac->comm_addr, aac->comm_phys);
+	if (aac->comm_addr)
+		pci_free_consistent(aac->pdev, aac->comm_size, aac->comm_addr,
+		  aac->comm_phys);
 	kfree(aac->queues);
 	aac_adapter_ioremap(aac, 0);
 	kfree(aac->fibs);