Commit:     be7963b7e7f08a149e247c0bf29a4abd174e0929
Parent:     6d0b842d3bf0cc027dcff57a89fb8a6b1fd610e1
Author:     Stefan Richter <[EMAIL PROTECTED]>
AuthorDate: Thu Sep 20 21:17:33 2007 +0200
Committer:  Stefan Richter <[EMAIL PROTECTED]>
CommitDate: Thu Sep 20 21:19:45 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.
    Signed-off-by: Stefan Richter <[EMAIL PROTECTED]>
 drivers/ieee1394/ieee1394_core.c |    2 +-
 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 ee45259..98fd985 100644
--- a/drivers/ieee1394/ieee1394_core.c
+++ b/drivers/ieee1394/ieee1394_core.c
@@ -1273,7 +1273,7 @@ static void __exit ieee1394_cleanup(void)
        unregister_chrdev_region(IEEE1394_CORE_DEV, 256);
-fs_initcall(ieee1394_init); /* same as ohci1394 */
 /* Exported symbols */
diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c
index 5667c81..372c5c1 100644
--- a/drivers/ieee1394/ohci1394.c
+++ b/drivers/ieee1394/ohci1394.c
@@ -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. */
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to