diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-06 16:50:15 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-06 16:50:15 -0700 |
| commit | 041ae629d17ff8f633ec47d0518f01fe60b21235 (patch) | |
| tree | 953400317a22a2b8cfca989f688dea3a44d50669 /pci | |
| parent | d60dd1771da480a60802cb0fdb977133fbd70115 (diff) | |
| download | patches-041ae629d17ff8f633ec47d0518f01fe60b21235.tar.gz | |
add pci patch
Diffstat (limited to 'pci')
| -rw-r--r-- | pci/fix-pci_get_device-usage-in-mpc85xx.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/pci/fix-pci_get_device-usage-in-mpc85xx.patch b/pci/fix-pci_get_device-usage-in-mpc85xx.patch new file mode 100644 index 0000000000000..917bf8eb2f37b --- /dev/null +++ b/pci/fix-pci_get_device-usage-in-mpc85xx.patch @@ -0,0 +1,32 @@ +From foo@baz Tue Apr 9 12:12:43 2002 +Date: Tue, 6 Jun 2006 16:58:25 -0400 +To: Greg KH <greg@kroah.com> +From: Greg Kroah-Hartman <gregkh@suse.de> +Subject: PCI: fix error with pci_get_device() call in the mpc85xx driver + +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + arch/ppc/platforms/85xx/mpc85xx_cds_common.c | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +--- gregkh-2.6.orig/arch/ppc/platforms/85xx/mpc85xx_cds_common.c ++++ gregkh-2.6/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); + } + } |