USB: xhci: Fix Link TRB handoff bit twiddling.

Make sure to preserve all bits *except* the TRB_CHAIN bit when giving a
Link TRB to the hardware.  We need to save things like TRB type and the
toggle bit in the control dword.

Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 9d6874710669ae55c55a239f1f5cb51d258aa1d8..8fb5d52c08c958ae9ffd2777e40ce4c0b763dfd2 100644 (file)
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -188,7 +188,7 @@ static void inc_enq(struct xhci_hcd *xhci, struct xhci_ring *ring, bool consumer
                                        next->link.control &= (u32) ~TRB_CYCLE;
                                else
                                        next->link.control |= (u32) TRB_CYCLE;
-                               next->link.control &= TRB_CHAIN;
+                               next->link.control &= ~TRB_CHAIN;
                                next->link.control |= chain;
                        }
                        /* Toggle the cycle bit after the last ring segment. */