summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiSheng Zhang <jszhang3@gmail.com>2011-07-16 11:04:19 +0800
committerGreg Kroah-Hartman <gregkh@suse.de>2011-08-17 10:55:51 -0700
commit2c97674e78c73410d4ac9f63643d05682b2e8f70 (patch)
treeea6b93f685560319aa680dcfb4bb51c2f0e89132
parent92d934f0145afdefdb47e688b6376b87ad4f066d (diff)
USB: xhci: fix OS want to own HC
commit 6768458b17f9bf48a4c3a34e49b20344091b5f7e upstream. Software should set XHCI_HC_OS_OWNED bit to request ownership of xHC. This patch should be backported to kernels as far back as 2.6.31. Signed-off-by: JiSheng Zhang <jszhang3@gmail.com> Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/host/pci-quirks.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
index 04b90ad319d7..e9f004ee56b4 100644
--- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c
@@ -803,7 +803,7 @@ static void __devinit quirk_usb_handoff_xhci(struct pci_dev *pdev)
/* If the BIOS owns the HC, signal that the OS wants it, and wait */
if (val & XHCI_HC_BIOS_OWNED) {
- writel(val & XHCI_HC_OS_OWNED, base + ext_cap_offset);
+ writel(val | XHCI_HC_OS_OWNED, base + ext_cap_offset);
/* Wait for 5 seconds with 10 microsecond polling interval */
timeout = handshake(base + ext_cap_offset, XHCI_HC_BIOS_OWNED,