From 9269dce0a994092b4dec54f336584be98b06db5c Mon Sep 17 00:00:00 2001 From: Sarah Sharp Date: Wed, 4 Jan 2012 16:54:12 -0800 Subject: [PATCH] --- yaml --- r: 280964 b: refs/heads/master c: e910b440da9f766f2623479be721032fecff98c3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/xhci-ring.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f7c5f56dd8c0..3229a1a5ac4b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 71d85724bdd947a3b42a88d08af79f290a1a767b +refs/heads/master: e910b440da9f766f2623479be721032fecff98c3 diff --git a/trunk/drivers/usb/host/xhci-ring.c b/trunk/drivers/usb/host/xhci-ring.c index b0a85459652e..b90e1386418b 100644 --- a/trunk/drivers/usb/host/xhci-ring.c +++ b/trunk/drivers/usb/host/xhci-ring.c @@ -1934,7 +1934,8 @@ static int handle_tx_event(struct xhci_hcd *xhci, if (!xdev) { xhci_err(xhci, "ERROR Transfer event pointed to bad slot\n"); xhci_err(xhci, "@%016llx %08x %08x %08x %08x\n", - xhci_trb_virt_to_dma(xhci->event_ring->deq_seg, + (unsigned long long) xhci_trb_virt_to_dma( + xhci->event_ring->deq_seg, xhci->event_ring->dequeue), lower_32_bits(le64_to_cpu(event->buffer)), upper_32_bits(le64_to_cpu(event->buffer)), @@ -1956,7 +1957,8 @@ static int handle_tx_event(struct xhci_hcd *xhci, xhci_err(xhci, "ERROR Transfer event for disabled endpoint " "or incorrect stream ring\n"); xhci_err(xhci, "@%016llx %08x %08x %08x %08x\n", - xhci_trb_virt_to_dma(xhci->event_ring->deq_seg, + (unsigned long long) xhci_trb_virt_to_dma( + xhci->event_ring->deq_seg, xhci->event_ring->dequeue), lower_32_bits(le64_to_cpu(event->buffer)), upper_32_bits(le64_to_cpu(event->buffer)),