]> err.no Git - linux-2.6/commitdiff
[PATCH] USB: fix ohci merge glitch
authordavid-b@pacbell.net <david-b@pacbell.net>
Wed, 29 Jun 2005 14:03:10 +0000 (07:03 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 12 Jul 2005 18:52:57 +0000 (11:52 -0700)
A patch re-organizing some parts of root hub initialization deleted the
code initializing the bus-neutral reboot/shutdown notifier for OHCI.
This patch just restores that deleted code.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/host/ohci-hcd.c

index 0375097850eeb4e5fabe5830c97e08fc11e8b438..68decab280ddd8c8d2a9766928a601cb4c73f38f 100644 (file)
@@ -673,8 +673,10 @@ retry:
 
        ohci_dump (ohci, 1);
 
-       if (ohci_to_hcd(ohci)->self.root_hub == NULL)
+       if (ohci_to_hcd(ohci)->self.root_hub == NULL) {
+               register_reboot_notifier (&ohci->reboot_notifier);
                create_debug_files (ohci);
+       }
 
        return 0;
 }