ieee1394: ohci1394: fix initialization if built non-modular
Initialization of ohci1394 was broken according to one reporter if the
driver was statically linked, i.e. not built as loadable module. Dmesg:
PCI: Device 0000:02:07.0 not available because of resource collisions
ohci1394: Failed to enable OHCI hardware.
This was reported for a Toshiba Satellite 5100-503. The cause is commit
8df4083c52
in Linux 2.6.19-rc1 which only
served purposes of early remote debugging via FireWire. This
functionality is better provided by the currently out-of-tree driver
ohci1394_earlyinit. Reversal of the commit was OK'd by Andi Kleen.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
parent
6d0b842d3b
commit
be7963b7e7
2 changed files with 2 additions and 4 deletions
|
@ -1273,7 +1273,7 @@ static void __exit ieee1394_cleanup(void)
|
|||
unregister_chrdev_region(IEEE1394_CORE_DEV, 256);
|
||||
}
|
||||
|
||||
fs_initcall(ieee1394_init); /* same as ohci1394 */
|
||||
module_init(ieee1394_init);
|
||||
module_exit(ieee1394_cleanup);
|
||||
|
||||
/* Exported symbols */
|
||||
|
|
|
@ -3537,7 +3537,5 @@ static int __init ohci1394_init(void)
|
|||
return pci_register_driver(&ohci1394_pci_driver);
|
||||
}
|
||||
|
||||
/* Register before most other device drivers.
|
||||
* Useful for remote debugging via physical DMA, e.g. using firescope. */
|
||||
fs_initcall(ohci1394_init);
|
||||
module_init(ohci1394_init);
|
||||
module_exit(ohci1394_cleanup);
|
||||
|
|
Loading…
Reference in a new issue