From bbae165765acf35780c2e103eccb402197c3279f Mon Sep 17 00:00:00 2001 From: JiSheng Zhang Date: Sat, 16 Jul 2011 11:04:19 +0800 Subject: [PATCH] --- yaml --- r: 262897 b: refs/heads/master c: 6768458b17f9bf48a4c3a34e49b20344091b5f7e h: refs/heads/master i: 262895: 6c00a9e9bef82ee74c30bca0af22e2d6be972861 v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/pci-quirks.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ff4ca755e135..7e571b7c8426 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7bd89b4017f46a9b92853940fd9771319acb578a +refs/heads/master: 6768458b17f9bf48a4c3a34e49b20344091b5f7e diff --git a/trunk/drivers/usb/host/pci-quirks.c b/trunk/drivers/usb/host/pci-quirks.c index a9d315906e3d..f4d1b691e6ec 100644 --- a/trunk/drivers/usb/host/pci-quirks.c +++ b/trunk/drivers/usb/host/pci-quirks.c @@ -817,7 +817,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,