USB: allow both root-hub interrupts and polling

Originally I didn't think any host controller driver would ever use
interrupts and polling at the same time, but it turns out ohci-hcd wants
to do exactly that.  This patch (as788) makes it possible.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 0d5cbf254e5e..37f9f5e7425d 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -836,8 +836,7 @@ void usb_enable_root_hub_irq (struct usb_bus *bus)
         struct usb_hcd *hcd;
 
         hcd = container_of (bus, struct usb_hcd, self);
-        if (hcd->driver->hub_irq_enable && !hcd->poll_rh &&
-                        hcd->state != HC_STATE_HALT)
+        if (hcd->driver->hub_irq_enable && hcd->state != HC_STATE_HALT)
                 hcd->driver->hub_irq_enable (hcd);
 }