diff options
| author | Alan Stern <stern@rowland.harvard.edu> | 2006-09-25 15:41:12 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-09-28 15:36:45 -0700 |
| commit | d19ac7da72ab950c315d0da0aa03464587d88b53 (patch) | |
| tree | 1007c1222a7844a18be1fb04de77f0a0ff7a28fc /drivers | |
| parent | 2de9eaefa7330b8e3d3fc5f31288cb1e826173a8 (diff) | |
| download | linux-3.10-d19ac7da72ab950c315d0da0aa03464587d88b53.tar.gz linux-3.10-d19ac7da72ab950c315d0da0aa03464587d88b53.tar.bz2 linux-3.10-d19ac7da72ab950c315d0da0aa03464587d88b53.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/core/hcd.c | 3 |
1 files changed, 1 insertions, 2 deletions
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); } |