diff options
| author | Nickolai Zeldovich <nickolai@csail.mit.edu> | 2013-01-07 22:39:31 -0500 |
|---|---|---|
| committer | Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2013-01-24 12:53:37 -0500 |
| commit | ba7b5c22d33136a5612ca5ef8d31564dcc501126 (patch) | |
| tree | 428f5d86255666319ab86584fddd845c961824a1 /drivers/usb | |
| parent | f18f8ed2a9adc41c2d9294b85b6af115829d2af1 (diff) | |
drivers: xhci: fix incorrect bit test
Fix incorrect bit test that originally showed up in
4ee823b83bc9851743fab756c76b27d6a1e2472b "USB/xHCI: Support
device-initiated USB 3.0 resume."
Use '&' instead of '&&'.
This should be backported to kernels as old as 3.4.
Signed-off-by: Nickolai Zeldovich <nickolai@csail.mit.edu>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/host/xhci-ring.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index 80ef717ec5b8..151204642a6e 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c | |||
| @@ -1698,7 +1698,7 @@ static void handle_port_status(struct xhci_hcd *xhci, | |||
| 1698 | faked_port_index + 1); | 1698 | faked_port_index + 1); |
| 1699 | if (slot_id && xhci->devs[slot_id]) | 1699 | if (slot_id && xhci->devs[slot_id]) |
| 1700 | xhci_ring_device(xhci, slot_id); | 1700 | xhci_ring_device(xhci, slot_id); |
| 1701 | if (bus_state->port_remote_wakeup && (1 << faked_port_index)) { | 1701 | if (bus_state->port_remote_wakeup & (1 << faked_port_index)) { |
| 1702 | bus_state->port_remote_wakeup &= | 1702 | bus_state->port_remote_wakeup &= |
| 1703 | ~(1 << faked_port_index); | 1703 | ~(1 << faked_port_index); |
| 1704 | xhci_test_and_clear_bit(xhci, port_array, | 1704 | xhci_test_and_clear_bit(xhci, port_array, |