[PATCH 4/5] Initialise pci_dev->irq correctly

[Matthew Wilcox <matthew@wil.cx>]

If the Interrupt Pin is 0, initialise the device's irq to NO_IRQ instead of
leaving it unset.

Signed-off-by: Matthew Wlcox <matthew@wil.cx>

---

 drivers/pci/probe.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

applies-to: 3175f6d926ef8ff55ee1fd96364d5b3ed430fb38
4ec4e15bcdd7401cf1fb19ef1cd4f64eb064a4c7
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index fce2cb2..652095c 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -571,9 +571,12 @@ static void pci_read_irq(struct pci_dev 
 	unsigned char irq;
 
 	pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &irq);
-	if (irq)
+	if (irq) {
 		pci_read_config_byte(dev, PCI_INTERRUPT_LINE, &irq);
-	dev->irq = irq;
+		dev->irq = irq;
+	} else {
+		dev->irq = NO_IRQ;
+	}
 }
 
 /**
---
0.99.8.GIT
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/