diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2017-07-02 18:48:48 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-07-02 18:48:48 -0500 |
| commit | 91bbec655f488b88281a2377b4e6c213d2d25978 (patch) | |
| tree | c74308fe715eb18f58b4c80b33c9c187c1e124ef /drivers/pci | |
| parent | f9bfeccd6603484563b00462480c9b32f5ae43bd (diff) | |
| parent | f5ab3b70a6063b340d7ea4fcea20313f5607c71e (diff) | |
| download | linux-91bbec655f488b88281a2377b4e6c213d2d25978.tar.bz2 | |
Merge branch 'pci/misc' into next
* pci/misc:
x86/PCI: Simplify Dell DMI B1 quirk
PCI: Add domain number check to find_smbios_instance_string()
x86/PCI: Fix whitespace in set_bios_x() printk
PCI: Correct PCI_STD_RESOURCE_END usage
efi/fb: Correct PCI_STD_RESOURCE_END usage
MIPS: PCI: Remove unused busn_offset
MIPS: Loongson: Remove unused PCI_BAR_COUNT definition
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/pci-label.c | 7 | ||||
| -rw-r--r-- | drivers/pci/quirks.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/drivers/pci/pci-label.c b/drivers/pci/pci-label.c index 51357377efbc..1d828a614ac0 100644 --- a/drivers/pci/pci-label.c +++ b/drivers/pci/pci-label.c @@ -43,9 +43,11 @@ static size_t find_smbios_instance_string(struct pci_dev *pdev, char *buf, { const struct dmi_device *dmi; struct dmi_dev_onboard *donboard; + int domain_nr; int bus; int devfn; + domain_nr = pci_domain_nr(pdev->bus); bus = pdev->bus->number; devfn = pdev->devfn; @@ -53,8 +55,9 @@ static size_t find_smbios_instance_string(struct pci_dev *pdev, char *buf, while ((dmi = dmi_find_device(DMI_DEV_TYPE_DEV_ONBOARD, NULL, dmi)) != NULL) { donboard = dmi->device_data; - if (donboard && donboard->bus == bus && - donboard->devfn == devfn) { + if (donboard && donboard->segment == domain_nr && + donboard->bus == bus && + donboard->devfn == devfn) { if (buf) { if (attribute == SMBIOS_ATTR_INSTANCE_SHOW) return scnprintf(buf, PAGE_SIZE, diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 085fb787aa9e..16e6cd86ad71 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -304,7 +304,7 @@ static void quirk_extend_bar_to_page(struct pci_dev *dev) { int i; - for (i = 0; i < PCI_STD_RESOURCE_END; i++) { + for (i = 0; i <= PCI_STD_RESOURCE_END; i++) { struct resource *r = &dev->resource[i]; if (r->flags & IORESOURCE_MEM && resource_size(r) < PAGE_SIZE) { |