summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authordavid-b@pacbell.net2005-06-29 16:03:10 +0200
committerGreg Kroah-Hartman2005-07-12 20:52:57 +0200
commitedfd6aee1f073ae645bd3e60ef96090fc9f0957b (patch)
tree562023bfb83441b20d61169780bc555065f175aa /drivers/usb
parent[PATCH] USB: ohci-omap pm updates (diff)
downloadkernel-qcow2-linux-edfd6aee1f073ae645bd3e60ef96090fc9f0957b.tar.gz
kernel-qcow2-linux-edfd6aee1f073ae645bd3e60ef96090fc9f0957b.tar.xz
kernel-qcow2-linux-edfd6aee1f073ae645bd3e60ef96090fc9f0957b.zip
[PATCH] USB: fix ohci merge glitch
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>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/host/ohci-hcd.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index 0375097850ee..68decab280dd 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -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;
}