Merge tag 'locks-v3.18-1' of git://git.samba.org/jlayton/linux

[firefly-linux-kernel-4.4.55.git] / drivers / usb / host / ehci-hcd.c

diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 488a30836c36cbee57f2e16f7813db7075891699..15feaf924b71aea658fa8529bcea1f3c3d53256f 100644 (file)
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -788,7 +788,7 @@ static irqreturn_t ehci_irq (struct usb_hcd *hcd)
                                continue;
 
                        /* start 20 msec resume signaling from this port,
-                        * and make khubd collect PORT_STAT_C_SUSPEND to
+                        * and make hub_wq collect PORT_STAT_C_SUSPEND to
                         * stop that signaling.  Use 5 ms extra for safety,
                         * like usb_port_resume() does.
                         */