From: david-b@pacbell.net Date: Wed, 29 Jun 2005 14:03:10 +0000 (-0700) Subject: [PATCH] USB: fix ohci merge glitch X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=edfd6aee1f073ae645bd3e60ef96090fc9f0957b;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git [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 Signed-off-by: Greg Kroah-Hartman --- 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; }