git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
arch
/
ppc
/
platforms
/
85xx
/
mpc85xx_cds_common.c
diff --git
a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
index
7520458
..
c9e0aee
100644
(file)
--- a/
arch/ppc/platforms/85xx/mpc85xx_cds_common.c
+++ b/
arch/ppc/platforms/85xx/mpc85xx_cds_common.c
@@
-11,6
+11,7
@@
* option) any later version.
*/
* option) any later version.
*/
+#include <linux/config.h>
#include <linux/stddef.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/stddef.h>
#include <linux/kernel.h>
#include <linux/init.h>
@@
-136,7
+137,7
@@
static irqreturn_t cpm2_cascade(int irq, void *dev_id, struct pt_regs *regs)
static struct irqaction cpm2_irqaction = {
.handler = cpm2_cascade,
static struct irqaction cpm2_irqaction = {
.handler = cpm2_cascade,
- .flags =
IRQF_DISABLED
,
+ .flags =
SA_INTERRUPT
,
.mask = CPU_MASK_NONE,
.name = "cpm2_cascade",
};
.mask = CPU_MASK_NONE,
.name = "cpm2_cascade",
};
@@
-378,12
+379,13
@@
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_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))) {
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);
}
}
pci_dev_put(dev);
}
}