From: Jiri Slaby Signed-off-by: Jiri Slaby Cc: Greg KH Signed-off-by: Andrew Morton --- arch/ppc/platforms/85xx/mpc85xx_cds_common.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff -puN arch/ppc/platforms/85xx/mpc85xx_cds_common.c~arch-pci_find_device-remove-ppc-platforms-85xx-mpc85xx_cds_commonc arch/ppc/platforms/85xx/mpc85xx_cds_common.c --- 25/arch/ppc/platforms/85xx/mpc85xx_cds_common.c~arch-pci_find_device-remove-ppc-platforms-85xx-mpc85xx_cds_commonc Thu Sep 1 14:33:56 2005 +++ 25-akpm/arch/ppc/platforms/85xx/mpc85xx_cds_common.c Thu Sep 1 14:33:56 2005 @@ -354,10 +354,10 @@ mpc85xx_cds_fixup_via(struct pci_control void __init mpc85xx_cds_pcibios_fixup(void) { - struct pci_dev *dev = NULL; + struct pci_dev *dev; u_char c; - if ((dev = pci_find_device(PCI_VENDOR_ID_VIA, + if ((dev = pci_get_device(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_1, NULL))) { /* * U-Boot does not set the enable bits @@ -374,21 +374,24 @@ mpc85xx_cds_pcibios_fixup(void) */ dev->irq = 14; pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq); + pci_dev_put(dev); } /* * Force legacy USB interrupt routing */ - if ((dev = pci_find_device(PCI_VENDOR_ID_VIA, + if ((dev = pci_get_device(PCI_VENDOR_ID_VIA, 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_find_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); + pci_dev_put(dev); } } #endif /* CONFIG_PCI */ _