Commit 552e94e6 authored by Dave Jones's avatar Dave Jones

[PATCH] make cardbus PCI enable earlier

Accesses PCI config space before enabling the device..
parent f140cc6c
...@@ -283,6 +283,8 @@ int cb_alloc(socket_info_t * s) ...@@ -283,6 +283,8 @@ int cb_alloc(socket_info_t * s)
dev->hdr_type = hdr & 0x7f; dev->hdr_type = hdr & 0x7f;
pci_setup_device(dev); pci_setup_device(dev);
if (pci_enable_device(dev))
continue;
strcpy(dev->dev.bus_id, dev->slot_name); strcpy(dev->dev.bus_id, dev->slot_name);
...@@ -300,7 +302,6 @@ int cb_alloc(socket_info_t * s) ...@@ -300,7 +302,6 @@ int cb_alloc(socket_info_t * s)
pci_writeb(dev, PCI_INTERRUPT_LINE, irq); pci_writeb(dev, PCI_INTERRUPT_LINE, irq);
} }
pci_enable_device(dev); /* XXX check return */
device_register(&dev->dev); device_register(&dev->dev);
pci_insert_device(dev, bus); pci_insert_device(dev, bus);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment