diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-12-01 23:11:43 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-12-01 23:11:52 +0400 |
| commit | 8593b6f6b0f05483dc6417b2fb7eb9dfaec34cba (patch) | |
| tree | 6b399a2c771893fafe33c2cd659ae291a5b10ccb /drivers/usb/host/xhci.c | |
| parent | 307369b0ca06b27b511b61714e335ddfccf19c4f (diff) | |
| parent | 0de13500ad1d8a66b7dc1e7fa517ea15a2625c9e (diff) | |
| download | linux-8593b6f6b0f05483dc6417b2fb7eb9dfaec34cba.tar.xz | |
Merge branch 'for-usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into usb-linus
* 'for-usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci:
Revert "xHCI: reset-on-resume quirk for NEC uPD720200"
xHCI: fix bug in xhci_clear_command_ring()
Diffstat (limited to 'drivers/usb/host/xhci.c')
| -rw-r--r-- | drivers/usb/host/xhci.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index aa94c0195791..a1afb7c39f7e 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -711,7 +711,10 @@ static void xhci_clear_command_ring(struct xhci_hcd *xhci) ring = xhci->cmd_ring; seg = ring->deq_seg; do { - memset(seg->trbs, 0, SEGMENT_SIZE); + memset(seg->trbs, 0, + sizeof(union xhci_trb) * (TRBS_PER_SEGMENT - 1)); + seg->trbs[TRBS_PER_SEGMENT - 1].link.control &= + cpu_to_le32(~TRB_CYCLE); seg = seg->next; } while (seg != ring->deq_seg); |