Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2015-09-07 21:21:52 +0200
committerJiri Kosina <jkosina@suse.cz>2015-09-07 21:21:52 +0200
commit94086916c0f4e96b1f5e08ef18dc8061e686097a (patch)
tree5be5e4e074f0695fe0f1546cb6e719fee9c89ae0
parent0c1fd3fee836c47bf5246b7807d069297d0daf0b (diff)
parentbc49fbe90f02bcc8fac8c56e80d90e84736fc139 (diff)
Merge branch 'SLE11-SP3' into SLE11-SP4rpm-3.0.101-65
-rw-r--r--drivers/usb/host/ehci-pci.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index ed1c8c17d849..b562b12289b3 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -144,6 +144,14 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
hcd->has_tt = 1;
tdi_reset(ehci);
}
+ /*
+ * on some BayTrail systems the firmware hands over the
+ * EHCI with interrupts disabled. Just in case, we override.
+ * Failure to do so renders the affected controllers unusable.
+ * In later kernels the generic PCI layer does this.
+ */
+ if (pdev->device == 0x0f34)
+ pci_intx(pdev, 1);
break;
case PCI_VENDOR_ID_TDI:
if (pdev->device == PCI_DEVICE_ID_TDI_EHCI) {