---

yaml --- r: 21482 b: refs/heads/master c: 101d5c1 h: refs/heads/master v: v3
git-mirror · Mar 20, 2006 · 95f6ac7 · 95f6ac7
1 parent c81bdc3
commit 95f6ac7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72aff53f1fe74153eccef303ab2f79de888d248c
+refs/heads/master: 101d5c18a928ef82b6c7bf99a9eaa536b5ccf593
diff --git a/trunk/arch/sparc64/kernel/pci_common.c b/trunk/arch/sparc64/kernel/pci_common.c
@@ -675,25 +675,25 @@ static int __init pci_intmap_match(struct pci_dev *pdev, unsigned int *interrupt
 {
 	struct pcidev_cookie *dev_pcp = pdev->sysdata;
 	struct pci_pbm_info *pbm = dev_pcp->pbm;
-	struct linux_prom_pci_registers reg;
+	struct linux_prom_pci_registers reg[PROMREG_MAX];
 	unsigned int hi, mid, lo, irq;
 	int i, cnode, plen;
 
 	cnode = pci_intmap_match_to_root(pbm, pdev, interrupt);
 	if (cnode == pbm->prom_node)
 		goto success;
 
-	plen = prom_getproperty(cnode, "reg", (char *) &reg, sizeof(reg));
+	plen = prom_getproperty(cnode, "reg", (char *) reg, sizeof(reg));
 	if (plen <= 0 ||
 	    (plen % sizeof(struct linux_prom_pci_registers)) != 0) {
 		printk("%s: OBP node %x reg property has bad len %d\n",
 		       pbm->name, cnode, plen);
 		goto fail;
 	}
 
-	hi   = reg.phys_hi & pbm->pbm_intmask.phys_hi;
-	mid  = reg.phys_mid & pbm->pbm_intmask.phys_mid;
-	lo   = reg.phys_lo & pbm->pbm_intmask.phys_lo;
+	hi   = reg[0].phys_hi & pbm->pbm_intmask.phys_hi;
+	mid  = reg[0].phys_mid & pbm->pbm_intmask.phys_mid;
+	lo   = reg[0].phys_lo & pbm->pbm_intmask.phys_lo;
 	irq  = *interrupt & pbm->pbm_intmask.interrupt;
 
 	for (i = 0; i < pbm->num_pbm_intmap; i++) {