projects
/
platform
/
kernel
/
linux-stable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fd1ac4c
)
usb: xhci: kill a conditional when toggling cycle
author
Dan Williams
<dan.j.williams@intel.com>
Mon, 7 Oct 2013 18:58:34 +0000
(11:58 -0700)
committer
Sarah Sharp
<sarah.a.sharp@linux.intel.com>
Wed, 16 Oct 2013 22:48:31 +0000
(15:48 -0700)
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>
drivers/usb/host/xhci-ring.c
patch
|
blob
|
history
diff --git
a/drivers/usb/host/xhci-ring.c
b/drivers/usb/host/xhci-ring.c
index e57163f952edccda54f202418b714b9f171daa6c..1e2f3f4958436fb120b81d41632ad7e7c76fb5b5 100644
(file)
--- 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)
if (ring->type == TYPE_EVENT &&
last_trb_on_last_seg(xhci, ring,
ring->deq_seg, ring->dequeue)) {
- ring->cycle_state
= (ring->cycle_state ? 0 : 1)
;
+ ring->cycle_state
^= 1
;
}
ring->deq_seg = ring->deq_seg->next;
ring->dequeue = ring->deq_seg->trbs;