git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull sony into release branch
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
pci_64.c
diff --git
a/arch/powerpc/kernel/pci_64.c
b/arch/powerpc/kernel/pci_64.c
index
a6b7692
..
7e97d71
100644
(file)
--- a/
arch/powerpc/kernel/pci_64.c
+++ b/
arch/powerpc/kernel/pci_64.c
@@
-360,6
+360,7
@@
struct pci_dev *of_create_pci_dev(struct device_node *node,
DBG(" class: 0x%x\n", dev->class);
dev->current_state = 4; /* unknown power state */
DBG(" class: 0x%x\n", dev->class);
dev->current_state = 4; /* unknown power state */
+ dev->error_state = pci_channel_io_normal;
if (!strcmp(type, "pci") || !strcmp(type, "pciex")) {
/* a PCI-PCI bridge */
if (!strcmp(type, "pci") || !strcmp(type, "pciex")) {
/* a PCI-PCI bridge */
@@
-380,8
+381,6
@@
struct pci_dev *of_create_pci_dev(struct device_node *node,
pci_device_add(dev, bus);
pci_device_add(dev, bus);
- /* XXX pci_scan_msi_device(dev); */
-
return dev;
}
EXPORT_SYMBOL(of_create_pci_dev);
return dev;
}
EXPORT_SYMBOL(of_create_pci_dev);
@@
-1324,7
+1323,6
@@
int pci_read_irq_line(struct pci_dev *pci_dev)
DBG(" -> mapped to linux irq %d\n", virq);
pci_dev->irq = virq;
DBG(" -> mapped to linux irq %d\n", virq);
pci_dev->irq = virq;
- pci_write_config_byte(pci_dev, PCI_INTERRUPT_LINE, virq);
return 0;
}
return 0;
}
@@
-1429,7
+1427,7
@@
long sys_pciconfig_iobase(long which, unsigned long in_bus,
for (ln = pci_root_buses.next; ln != &pci_root_buses; ln = ln->next) {
bus = pci_bus_b(ln);
for (ln = pci_root_buses.next; ln != &pci_root_buses; ln = ln->next) {
bus = pci_bus_b(ln);
- if (in_bus >= bus->number && in_bus <
(bus->number + bus->subordinate)
)
+ if (in_bus >= bus->number && in_bus <
= bus->subordinate
)
break;
bus = NULL;
}
break;
bus = NULL;
}