From 8b7309bae0e1c04350714f578bc3debb55cd1ba7 Mon Sep 17 00:00:00 2001
From: Mike Miller <mike.miller@hp.com>
Date: Thu, 2 Apr 2009 12:50:56 -0700
Subject: [PATCH] --- yaml --- r: 142740 b: refs/heads/master c:
 e143858104e318263689c551543dfc3f186cea12 h: refs/heads/master v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/block/cciss.c | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 62e5b63bce66..41b47cfa1679 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a9279cc7cbe726e995c44a1acae81d446775816
+refs/heads/master: e143858104e318263689c551543dfc3f186cea12
diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c
index 4e5441baa49d..219c530c8da0 100644
--- a/trunk/drivers/block/cciss.c
+++ b/trunk/drivers/block/cciss.c
@@ -3265,12 +3265,21 @@ static int __devinit cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
  */
 	cciss_interrupt_mode(c, pdev, board_id);
 
-	/*
-	 * Memory base addr is first addr , the second points to the config
-	 *   table
-	 */
+	/* find the memory BAR */
+	for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
+		if (pci_resource_flags(pdev, i) & IORESOURCE_MEM)
+			break;
+	}
+	if (i == DEVICE_COUNT_RESOURCE) {
+		printk(KERN_WARNING "cciss: No memory BAR found\n");
+		err = -ENODEV;
+		goto err_out_free_res;
+	}
+
+	c->paddr = pci_resource_start(pdev, i); /* addressing mode bits
+						 * already removed
+						 */
 
-	c->paddr = pci_resource_start(pdev, 0);	/* addressing mode bits already removed */
 #ifdef CCISS_DEBUG
 	printk("address 0 = %lx\n", c->paddr);
 #endif				/* CCISS_DEBUG */