IEEE1394 fix
Linus, please pull from the for-linus branch at
git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git for-linus
to receive the following fix, or simply apply from this mail.
drivers/ieee1394/ieee1394_core.c | 2 +- drivers/ieee1394/ohci1394.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-)
commit be7963b7e7f08a149e247c0bf29a4abd174e0929
Author: Stefan Richter <[email protected]> Date: Thu Sep 20 21:17:33 2007 +0200
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 8df4083c5291b3647e0381d3c69ab2196f5dd3b7 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.
drivers/ieee1394/ieee1394_core.c +1 -1
@@ -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 */
drivers/ieee1394/ohci1394.c +1 -3
@@ -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);
Signature · 3 lines
Stefan Richter -=====-=-=== =--= =-=-- http://arcgraph.de/sr/