]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
[PARISC] lba_pci: pci_claim_resources disabled expansion roms
authorKyle McMartin <kyle@shortfin.cabal.ca>
Thu, 6 Dec 2007 17:38:26 +0000 (09:38 -0800)
committerKyle McMartin <kyle@shortfin.cabal.ca>
Thu, 6 Dec 2007 17:38:26 +0000 (09:38 -0800)
radeonfb was HPMC-ing my C8000 by trying to map its expansion rom from
IO_VIEW, instead of PA_VIEW. Fix seems to be to ensure that its disabled
ROM is properly inserted into the resource tree.

FIXME: this will result in a whinging printk for cards which share expansion
ROMS, such as a quad tulip. Thankfully, it isn't harmful.

Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
drivers/parisc/lba_pci.c

index 5eace9e66e14c9bd86c15414b186061f6f345ab4..66ce61048361ab665d6a7359d0cb7d43dcabbb38 100644 (file)
@@ -768,9 +768,13 @@ lba_fixup_bus(struct pci_bus *bus)
                                DBG("lba_fixup_bus() WTF? 0x%lx [%lx/%lx] XXX",
                                        res->flags, res->start, res->end);
                        }
-                       if ((i != PCI_ROM_RESOURCE) ||
-                           (res->flags & IORESOURCE_ROM_ENABLE))
-                               pci_claim_resource(dev, i);
+
+                       /*
+                       ** FIXME: this will result in whinging for devices
+                       ** that share expansion ROMs (think quad tulip), but
+                       ** isn't harmful.
+                       */
+                       pci_claim_resource(dev, i);
                }
 
 #ifdef FBB_SUPPORT