diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-06 16:58:25 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-21 15:00:01 -0400 |
commit | 4d15a1779dfdf7e7a111022697d3a43da1745d31 (patch) | |
tree | 883b86d569d70b52b4e4fc0170fb8efaa42b6260 | |
parent | bd91fde952b0aa80c820857241ff1923537d2bde (diff) |
[PATCH] PCI: fix error with pci_get_device() call in the mpc85xx driver
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | arch/ppc/platforms/85xx/mpc85xx_cds_common.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c index c9e0aeeca3d8..4368dc3f3c30 100644 --- a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c +++ b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c | |||
@@ -379,13 +379,12 @@ mpc85xx_cds_pcibios_fixup(void) | |||
379 | PCI_DEVICE_ID_VIA_82C586_2, NULL))) { | 379 | PCI_DEVICE_ID_VIA_82C586_2, NULL))) { |
380 | dev->irq = 10; | 380 | dev->irq = 10; |
381 | pci_write_config_byte(dev, PCI_INTERRUPT_LINE, 10); | 381 | pci_write_config_byte(dev, PCI_INTERRUPT_LINE, 10); |
382 | pci_dev_put(dev); | ||
383 | } | ||
384 | 382 | ||
385 | if ((dev = pci_get_device(PCI_VENDOR_ID_VIA, | 383 | if ((dev = pci_get_device(PCI_VENDOR_ID_VIA, |
386 | PCI_DEVICE_ID_VIA_82C586_2, dev))) { | 384 | PCI_DEVICE_ID_VIA_82C586_2, dev))) { |
387 | dev->irq = 11; | 385 | dev->irq = 11; |
388 | pci_write_config_byte(dev, PCI_INTERRUPT_LINE, 11); | 386 | pci_write_config_byte(dev, PCI_INTERRUPT_LINE, 11); |
387 | } | ||
389 | pci_dev_put(dev); | 388 | pci_dev_put(dev); |
390 | } | 389 | } |
391 | } | 390 | } |