diff options
author | Dan Williams <dan.j.williams@intel.com> | 2013-10-07 14:58:34 -0400 |
---|---|---|
committer | Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2013-10-16 18:48:31 -0400 |
commit | 4e341818ee9ee8d435977131cc7ce9e89c053fa6 (patch) | |
tree | 9009af35f1fc28135ac548fab3e29f89e5632fc3 /drivers/usb/host/xhci-ring.c | |
parent | fd1ac4cf524018198373c5eb90ca0e7968c5bbb8 (diff) |
usb: xhci: kill a conditional when toggling cycle
Perform an unconditional toggle of the cycle bit with 'xor'.
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Diffstat (limited to 'drivers/usb/host/xhci-ring.c')
-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 e57163f952ed..1e2f3f495843 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c | |||
@@ -178,7 +178,7 @@ static void inc_deq(struct xhci_hcd *xhci, struct xhci_ring *ring) | |||
178 | if (ring->type == TYPE_EVENT && | 178 | if (ring->type == TYPE_EVENT && |
179 | last_trb_on_last_seg(xhci, ring, | 179 | last_trb_on_last_seg(xhci, ring, |
180 | ring->deq_seg, ring->dequeue)) { | 180 | ring->deq_seg, ring->dequeue)) { |
181 | ring->cycle_state = (ring->cycle_state ? 0 : 1); | 181 | ring->cycle_state ^= 1; |
182 | } | 182 | } |
183 | ring->deq_seg = ring->deq_seg->next; | 183 | ring->deq_seg = ring->deq_seg->next; |
184 | ring->dequeue = ring->deq_seg->trbs; | 184 | ring->dequeue = ring->deq_seg->trbs; |