aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/pci/probe.c1
-rw-r--r--include/linux/pci.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index fce2cb2112d8..2f82e63323f3 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -571,6 +571,7 @@ static void pci_read_irq(struct pci_dev *dev)
571 unsigned char irq; 571 unsigned char irq;
572 572
573 pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &irq); 573 pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &irq);
574 dev->pin = irq;
574 if (irq) 575 if (irq)
575 pci_read_config_byte(dev, PCI_INTERRUPT_LINE, &irq); 576 pci_read_config_byte(dev, PCI_INTERRUPT_LINE, &irq);
576 dev->irq = irq; 577 dev->irq = irq;
diff --git a/include/linux/pci.h b/include/linux/pci.h
index de690ca73d58..b32f70fe2dbd 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -98,6 +98,7 @@ struct pci_dev {
98 unsigned int class; /* 3 bytes: (base,sub,prog-if) */ 98 unsigned int class; /* 3 bytes: (base,sub,prog-if) */
99 u8 hdr_type; /* PCI header type (`multi' flag masked out) */ 99 u8 hdr_type; /* PCI header type (`multi' flag masked out) */
100 u8 rom_base_reg; /* which config register controls the ROM */ 100 u8 rom_base_reg; /* which config register controls the ROM */
101 u8 pin; /* which interrupt pin this device uses */
101 102
102 struct pci_driver *driver; /* which driver has allocated this device */ 103 struct pci_driver *driver; /* which driver has allocated this device */
103 u64 dma_mask; /* Mask of the bits of bus address this 104 u64 dma_mask; /* Mask of the bits of bus address this