Commit 477ddcd8 authored by Bjorn Helgaas's avatar Bjorn Helgaas

Merge branch 'pci/controller/hyperv'

- Return zero, not garbage, when reading PCI_INTERRUPT_PIN from a Hyper-V
  device (Wei Liu)

* pci/controller/hyperv:
  PCI: hv: Return zero, not garbage, when reading PCI_INTERRUPT_PIN
parents da3552d2 fea93a3e
...@@ -1130,8 +1130,8 @@ static void _hv_pcifront_read_config(struct hv_pci_dev *hpdev, int where, ...@@ -1130,8 +1130,8 @@ static void _hv_pcifront_read_config(struct hv_pci_dev *hpdev, int where,
PCI_CAPABILITY_LIST) { PCI_CAPABILITY_LIST) {
/* ROM BARs are unimplemented */ /* ROM BARs are unimplemented */
*val = 0; *val = 0;
} else if (where >= PCI_INTERRUPT_LINE && where + size <= } else if ((where >= PCI_INTERRUPT_LINE && where + size <= PCI_INTERRUPT_PIN) ||
PCI_INTERRUPT_PIN) { (where >= PCI_INTERRUPT_PIN && where + size <= PCI_MIN_GNT)) {
/* /*
* Interrupt Line and Interrupt PIN are hard-wired to zero * Interrupt Line and Interrupt PIN are hard-wired to zero
* because this front-end only supports message-signaled * because this front-end only supports message-signaled
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment