Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt

[linux-2.6-omap-h63xx.git] / arch / powerpc / kernel / pci_32.c

diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c
index cd35c969bb283f5a52d76b14e8bb208799aafd9f..0e2bee46304c51fc109d0e2b899a6ce6a559f841 100644 (file)
--- a/arch/powerpc/kernel/pci_32.c
+++ b/arch/powerpc/kernel/pci_32.c
@@ -581,8 +581,11 @@ pcibios_assign_resources(void)
                        if ((r->flags & IORESOURCE_UNSET) && r->end &&
                            (!ppc_md.pcibios_enable_device_hook ||
                             !ppc_md.pcibios_enable_device_hook(dev, 1))) {
+                               int rc;
+
                                r->flags &= ~IORESOURCE_UNSET;
-                               pci_assign_resource(dev, idx);
+                               rc = pci_assign_resource(dev, idx);
+                               BUG_ON(rc);
                        }
                }
 
@@ -1454,8 +1457,8 @@ null_write_config(struct pci_bus *bus, unsigned int devfn, int offset,
 
 static struct pci_ops null_pci_ops =
 {
-       null_read_config,
-       null_write_config
+       .read = null_read_config,
+       .write = null_write_config,
 };
 
 /*