Skip to content

Commit 477ddcd

Browse files
committed
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
2 parents da3552d + fea93a3 commit 477ddcd

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/pci/controller/pci-hyperv.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1130,8 +1130,8 @@ static void _hv_pcifront_read_config(struct hv_pci_dev *hpdev, int where,
11301130
PCI_CAPABILITY_LIST) {
11311131
/* ROM BARs are unimplemented */
11321132
*val = 0;
1133-
} else if (where >= PCI_INTERRUPT_LINE && where + size <=
1134-
PCI_INTERRUPT_PIN) {
1133+
} else if ((where >= PCI_INTERRUPT_LINE && where + size <= PCI_INTERRUPT_PIN) ||
1134+
(where >= PCI_INTERRUPT_PIN && where + size <= PCI_MIN_GNT)) {
11351135
/*
11361136
* Interrupt Line and Interrupt PIN are hard-wired to zero
11371137
* because this front-end only supports message-signaled

0 commit comments

Comments
 (0)