UPSTREAM: drivers: xhci: fix incorrect bit test
authorNickolai Zeldovich <nickolai@csail.mit.edu>
Tue, 8 Jan 2013 03:39:31 +0000 (22:39 -0500)
committerChromeBot <chrome-bot@google.com>
Fri, 22 Mar 2013 01:02:55 +0000 (18:02 -0700)
commit8656c00cc7630ef58c01d7d1a9d78af41a4fd166
treea45be2b75fb5f0048036fa0b60d53eabb7cc166c
parent99c486b8ff0ebaa2aee3a875d675bc8fc2780c10
UPSTREAM: drivers: xhci: fix incorrect bit test

commit ba7b5c22d33136a5612ca5ef8d31564dcc501126 upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 5c59de0a37d7721221550c2be2b07ea41966bf40)

BUG=None
TEST=Together with other cherry-picks: run BVT trybots on all platforms,
manually confirm that USB network/storage/input devices still work
(including across suspend/resume)

Change-Id: I09d3572b30dbf8922a8894bc0dcddc71e6c64833
Signed-off-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/46077
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
drivers/usb/host/xhci-ring.c