diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-11-04 17:01:27 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-11-04 17:01:27 -0700 |
| commit | 589a1b076ff9b6f84184507ec303229b3df20658 (patch) | |
| tree | 34aa585dcdcd740cde0a5fd6575efedc198d859f | |
| parent | 33de1b8bf6e11a3bc69faf2f7ffb3692c723bdf5 (diff) | |
| parent | 9437eca18170008a085a61bf96c99f2d923b0393 (diff) | |
| download | linux-589a1b076ff9b6f84184507ec303229b3df20658.tar.gz linux-589a1b076ff9b6f84184507ec303229b3df20658.tar.bz2 linux-589a1b076ff9b6f84184507ec303229b3df20658.zip | |
Merge branch 'pci/yijing-pci_is_pcie-v2' into next
* pci/yijing-pci_is_pcie-v2:
powerpc/pci: Use pci_is_pcie() to simplify code [fix]
| -rw-r--r-- | arch/powerpc/kernel/eeh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c index 6ebbe545b7a5..db86f97a0e92 100644 --- a/arch/powerpc/kernel/eeh.c +++ b/arch/powerpc/kernel/eeh.c @@ -195,7 +195,7 @@ static size_t eeh_gather_pci_data(struct eeh_dev *edev, char * buf, size_t len) "EEH: PCI-E capabilities and status follow:\n"); for (i=0; i<=8; i++) { - eeh_ops->read_config(dn, cap+4*i, 4, &cfg); + eeh_ops->read_config(dn, dev->pcie_cap+4*i, 4, &cfg); n += scnprintf(buf+n, len-n, "%02x:%x\n", 4*i, cfg); printk(KERN_WARNING "EEH: PCI-E %02x: %08x\n", i, cfg); } |