diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-08-19 16:42:01 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-08-19 16:42:01 -0700 |
| commit | 312effedac183148411c965e20a62e73f23979f6 (patch) | |
| tree | 81e466e84e7a2ebe9ee53e5d0963dc2d3c3f7356 /drivers/usb/host/pci-quirks.c | |
| parent | d3828df964e542533765b23f9a343657c7860e17 (diff) | |
| parent | dbf7603a92cd895b8c1017734bc30fd9a32fd933 (diff) | |
Merge branch 'upstream/linaro-3.0' into linaro-android-3.0linux-linaro-3.0-2011.08-0-android-1
Diffstat (limited to 'drivers/usb/host/pci-quirks.c')
| -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 04b90ad319d..e9f004ee56b 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, |