---

yaml --- r: 280964 b: refs/heads/master c: e910b44 h: refs/heads/master v: v3
git-mirror · Jan 5, 2012 · 9269dce · 9269dce
1 parent 3e12c46
commit 9269dce
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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)),