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 12:00:01 -0700 |
| commit | 4d15a1779dfdf7e7a111022697d3a43da1745d31 (patch) | |
| tree | 883b86d569d70b52b4e4fc0170fb8efaa42b6260 /arch/ppc/platforms | |
| parent | bd91fde952b0aa80c820857241ff1923537d2bde (diff) | |
| download | op-kernel-dev-4d15a1779dfdf7e7a111022697d3a43da1745d31.zip op-kernel-dev-4d15a1779dfdf7e7a111022697d3a43da1745d31.tar.gz | |
[PATCH] PCI: fix error with pci_get_device() call in the mpc85xx driver
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/ppc/platforms')
| -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 c9e0aee..4368dc3 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) PCI_DEVICE_ID_VIA_82C586_2, NULL))) { dev->irq = 10; pci_write_config_byte(dev, PCI_INTERRUPT_LINE, 10); - pci_dev_put(dev); - } - if ((dev = pci_get_device(PCI_VENDOR_ID_VIA, + if ((dev = pci_get_device(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_2, dev))) { - dev->irq = 11; - pci_write_config_byte(dev, PCI_INTERRUPT_LINE, 11); + dev->irq = 11; + pci_write_config_byte(dev, PCI_INTERRUPT_LINE, 11); + } pci_dev_put(dev); } } |
