From 86a76ad7709929754a82d94cbcd2b089f74e0018 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Wed, 3 Oct 2007 21:37:57 -0700 Subject: [PATCH] --- yaml --- r: 65291 b: refs/heads/master c: 27097ef9ff219c81a023911c7b0d5e7bc2419177 h: refs/heads/master i: 65289: 6ff5019cb14cfb853c7e7d48f6a03ca736ea972f 65287: 25032cb326abda393d1d7dad62fe20e9fc064adc v: v3 --- [refs] | 2 +- trunk/arch/sparc64/kernel/pci_common.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f8caed484528..93b5d083dfda 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e2fd58d06f79b10cad22240a6e6fb1c1108aa0ee +refs/heads/master: 27097ef9ff219c81a023911c7b0d5e7bc2419177 diff --git a/trunk/arch/sparc64/kernel/pci_common.c b/trunk/arch/sparc64/kernel/pci_common.c index 2f61c4b12596..c76bfbb7da08 100644 --- a/trunk/arch/sparc64/kernel/pci_common.c +++ b/trunk/arch/sparc64/kernel/pci_common.c @@ -264,7 +264,7 @@ static int sun4v_read_pci_cfg(struct pci_bus *bus_dev, unsigned int devfn, unsigned int func = PCI_FUNC(devfn); unsigned long ret; - if (bus_dev == pbm->pci_bus && devfn == 0x00) + if (!bus && devfn == 0x00) return pci_host_bridge_read_pci_cfg(bus_dev, devfn, where, size, value); if (config_out_of_range(pbm, bus, devfn, where)) { @@ -300,7 +300,7 @@ static int sun4v_write_pci_cfg(struct pci_bus *bus_dev, unsigned int devfn, unsigned int func = PCI_FUNC(devfn); unsigned long ret; - if (bus_dev == pbm->pci_bus && devfn == 0x00) + if (!bus && devfn == 0x00) return pci_host_bridge_write_pci_cfg(bus_dev, devfn, where, size, value); if (config_out_of_range(pbm, bus, devfn, where)) {