diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-09-21 08:11:08 +0200 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2007-10-17 21:30:34 +0200 |
| commit | 73c3d061da9a50bdd17240440aa66647c72624a9 (patch) | |
| tree | 8ae539a555261200cdfdfb2631c4f73a983bb1e2 | |
| parent | 0fb2960efa23678548c535457d101d34e58d7ae1 (diff) | |
| download | linux-stable-73c3d061da9a50bdd17240440aa66647c72624a9.tar.gz linux-stable-73c3d061da9a50bdd17240440aa66647c72624a9.tar.bz2 linux-stable-73c3d061da9a50bdd17240440aa66647c72624a9.zip | |
[PATCH] 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.
Same as pre-2.6.23 commit be7963b7e7f08a149e247c0bf29a4abd174e0929.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/ieee1394/ieee1394_core.c | 2 | ||||
| -rw-r--r-- | drivers/ieee1394/ohci1394.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/ieee1394/ieee1394_core.c b/drivers/ieee1394/ieee1394_core.c index 9a48ca20d1fd..3fc389552ae0 100644 --- a/drivers/ieee1394/ieee1394_core.c +++ b/drivers/ieee1394/ieee1394_core.c @@ -1170,7 +1170,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 */ diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c index 628130a58af3..ec301a8d8c0b 100644 --- a/drivers/ieee1394/ohci1394.c +++ b/drivers/ieee1394/ohci1394.c @@ -3785,7 +3785,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); |