diff options
| author | Clark Williams <williams@redhat.com> | 2012-03-01 09:15:01 -0600 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-03-01 09:15:01 -0600 |
| commit | 5ee07f2a498e0a5f4a9994317c0f2e451e27b4f2 (patch) | |
| tree | 8d8cc50a7de738e1e6b7a66ec27120f616b3919a /drivers/usb/core/hcd.c | |
| parent | 5f269e50cb10cd1a74b89f7fda87b0c9082754f0 (diff) | |
| parent | 44fb3170ae46f8de964a4bb5b0504e865a6dd7da (diff) | |
Merge commit 'v3.2.9' into rt-3.2.9-rt13v3.2.9-rt13
Diffstat (limited to 'drivers/usb/core/hcd.c')
| -rw-r--r-- | drivers/usb/core/hcd.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index 505265e60219..32dfd76d8f92 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c @@ -2465,8 +2465,10 @@ int usb_add_hcd(struct usb_hcd *hcd, && device_can_wakeup(&hcd->self.root_hub->dev)) dev_dbg(hcd->self.controller, "supports USB remote wakeup\n"); - /* enable irqs just before we start the controller */ - if (usb_hcd_is_primary_hcd(hcd)) { + /* enable irqs just before we start the controller, + * if the BIOS provides legacy PCI irqs. + */ + if (usb_hcd_is_primary_hcd(hcd) && irqnum) { retval = usb_hcd_request_irqs(hcd, irqnum, irqflags); if (retval) goto err_request_irq; |