From b88a3270dc1b37aa905e382826767d727e66909c Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Sun, 6 Nov 2005 23:39:35 -0800 Subject: [PATCH] --- yaml --- r: 17487 b: refs/heads/master c: 48d68773629d52ef118cd3f78eef7545d68517ef h: refs/heads/master i: 17485: 2e521abaf5ab10655953ac79af54561e2dab4a2f 17483: fda16eb8242f710598ebc873e61216ce82e7816e 17479: c9e39b92f0422a85a61859170a0b2c5e730b4c8a 17471: c8f5f37877c96ee55def1dccfc847d236abc4480 v: v3 --- [refs] | 2 +- trunk/arch/ppc/platforms/85xx/mpc85xx_cds_common.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index b39f578c3236..630dd83dfe8a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cee029538151c0e7bb3cd1c298f222deeecb5ab8 +refs/heads/master: 48d68773629d52ef118cd3f78eef7545d68517ef diff --git a/trunk/arch/ppc/platforms/85xx/mpc85xx_cds_common.c b/trunk/arch/ppc/platforms/85xx/mpc85xx_cds_common.c index 5e8cc5ec6ab5..2959e3c4083d 100644 --- a/trunk/arch/ppc/platforms/85xx/mpc85xx_cds_common.c +++ b/trunk/arch/ppc/platforms/85xx/mpc85xx_cds_common.c @@ -351,10 +351,10 @@ mpc85xx_cds_fixup_via(struct pci_controller *hose) 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 @@ -371,21 +371,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 */