From ac6bb28522c80b419bf0e45251072208737f82e9 Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Thu, 20 Dec 2007 14:54:56 +1100 Subject: [PATCH] --- yaml --- r: 81119 b: refs/heads/master c: 24f8c827f9b8ab2c8644f7ab85a1b1d58fc0fcf7 h: refs/heads/master i: 81117: 58dc4bd8523ab313d62950a18d7c5989db872cc0 81115: 68aadbd0d017f314d4593cd7215ac150760af067 81111: 6439f55dfeaeeabb0d8551ad6eac98004eab144e 81103: 4cd37c6996434e55b44e1fb16da25e7789a2fae3 81087: 6efb234dd1e5c5d29caaed8578567fd15677fef2 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/pci_32.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9552b5e9a5e9..7e3b7d6b54fb 100644 --- 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 index ce7c20c8191f..12b74fd098ee 100644 --- 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)