---

yaml --- r: 81119 b: refs/heads/master c: 24f8c82 h: refs/heads/master i: 81117: 58dc4bd 81115: 68aadbd 81111: 6439f55 81103: 4cd37c6 81087: 6efb234 v: v3
git-mirror · Dec 20, 2007 · ac6bb28 · ac6bb28
1 parent 2969bd3
commit ac6bb28
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 50c9bc2fc86fddd39eea6a12ceb81585bc2aafaa
+refs/heads/master: 24f8c827f9b8ab2c8644f7ab85a1b1d58fc0fcf7
diff --git a/trunk/arch/powerpc/kernel/pci_32.c b/trunk/arch/powerpc/kernel/pci_32.c
@@ -530,10 +530,16 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
 
 	pci_read_config_word(dev, PCI_COMMAND, &cmd);
 	old_cmd = cmd;
-	for (idx=0; idx<6; idx++) {
+	for (idx = 0; idx < PCI_NUM_RESOURCES; idx++) {
+		/* Only set up the requested stuff */
+		if (!(mask & (1 << idx)))
+			continue;
 		r = &dev->resource[idx];
+		if (!(r->flags & (IORESOURCE_IO | IORESOURCE_MEM)))
+			continue;
 		if (r->flags & IORESOURCE_UNSET) {
-			printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", pci_name(dev));
+			printk(KERN_ERR "PCI: Device %s not available because"
+			       " of resource collisions\n", pci_name(dev));
 			return -EINVAL;
 		}
 		if (r->flags & IORESOURCE_IO)