From: Alan Stern <stern@rowland.harvard.edu>
Date: Mon, 25 Sep 2006 19:41:12 +0000 (-0400)
Subject: USB: allow both root-hub interrupts and polling
X-Git-Tag: v2.6.19-rc1~865
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d19ac7da72ab950c315d0da0aa03464587d88b53;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 0d5cbf254e5..37f9f5e7425 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);
 }