diff options
| author | JiSheng Zhang <jszhang3@gmail.com> | 2011-07-16 11:04:19 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-29 14:08:01 -0700 |
| commit | b6708a1c905318749d1d51037c000fcf883b41b1 (patch) | |
| tree | 994000b0d5e95a824b7f5ecb07cd3353edb72ddd | |
| parent | 8d8f093da9795e0a22f1e4fc6a0a66fccba091a9 (diff) | |
| download | lwn-b6708a1c905318749d1d51037c000fcf883b41b1.tar.gz lwn-b6708a1c905318749d1d51037c000fcf883b41b1.zip | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c index bcf7a88fe516..eae8b18437cb 100644 --- a/drivers/usb/host/pci-quirks.c +++ b/drivers/usb/host/pci-quirks.c @@ -444,7 +444,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, |