From 1213d5e5e15c0f08cc47b67afc77d980ba4a0eab Mon Sep 17 00:00:00 2001 From: Matthias Fuchs Date: Wed, 10 Sep 2008 05:55:46 +0000 Subject: [PATCH] --- yaml --- r: 114582 b: refs/heads/master c: 5a013fc7bb48acefe94011f4b83fef95b381f875 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/sysdev/ppc4xx_pci.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 04f44abfedd9..ab2fc24e8d9d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fbcc4bacee30cad4e4a13d05492a9ed0c9c3e8c7 +refs/heads/master: 5a013fc7bb48acefe94011f4b83fef95b381f875 diff --git a/trunk/arch/powerpc/sysdev/ppc4xx_pci.c b/trunk/arch/powerpc/sysdev/ppc4xx_pci.c index 5da8a44ea2f6..9f6f73d584d6 100644 --- a/trunk/arch/powerpc/sysdev/ppc4xx_pci.c +++ b/trunk/arch/powerpc/sysdev/ppc4xx_pci.c @@ -276,9 +276,16 @@ static void __init ppc4xx_probe_pci_bridge(struct device_node *np) const int *bus_range; int primary = 0; + /* Check if device is enabled */ + if (!of_device_is_available(np)) { + printk(KERN_INFO "%s: Port disabled via device-tree\n", + np->full_name); + return; + } + /* Fetch config space registers address */ if (of_address_to_resource(np, 0, &rsrc_cfg)) { - printk(KERN_ERR "%s:Can't get PCI config register base !", + printk(KERN_ERR "%s: Can't get PCI config register base !", np->full_name); return; }