From d59e106c52cd43a7fe19cadfe670d3a3533ff3ed Mon Sep 17 00:00:00 2001
From: Paul Zimmerman <Paul.Zimmerman@synopsys.com>
Date: Thu, 14 Mar 2013 13:12:00 -0700
Subject: [PATCH] --- yaml --- r: 363439 b: refs/heads/master c:
 157dfaac1f2922a3cbd90685339511cb97cad225 h: refs/heads/master i:   363437:
 b63efa4f9c46f8399dd62959935698ec873ca65b   363435:
 104bb220f8e38f87be100b26975a926c0ed3e747   363431:
 afe6b054afed4d9b6d0fbf73b20822d45b40e032   363423:
 32cb3ed40b2cdcf6a7d1611714efe96d528a92d6 v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/staging/dwc2/hcd.c      | 13 +++++++------
 trunk/drivers/staging/dwc2/hcd_intr.c |  8 ++++----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 3e46a075d851..2be576206258 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca4d4aa6b79f143f4c8606c60bad005405623faa
+refs/heads/master: 157dfaac1f2922a3cbd90685339511cb97cad225
diff --git a/trunk/drivers/staging/dwc2/hcd.c b/trunk/drivers/staging/dwc2/hcd.c
index cdb142dda476..246b483481fa 100644
--- a/trunk/drivers/staging/dwc2/hcd.c
+++ b/trunk/drivers/staging/dwc2/hcd.c
@@ -1890,8 +1890,9 @@ void dwc2_hcd_dump_state(struct dwc2_hsotg *hsotg)
 				dev_dbg(hsotg->dev,
 					"      transfer_buffer: %p\n",
 					urb->buf);
-				dev_dbg(hsotg->dev, "      transfer_dma: %p\n",
-					(void *)urb->dma);
+				dev_dbg(hsotg->dev,
+					"      transfer_dma: %08lx\n",
+					(unsigned long)urb->dma);
 				dev_dbg(hsotg->dev,
 					"      transfer_buffer_length: %d\n",
 					urb->length);
@@ -2296,10 +2297,10 @@ static void dwc2_dump_urb_info(struct usb_hcd *hcd, struct urb *urb,
 		 usb_maxpacket(urb->dev, urb->pipe, usb_pipeout(urb->pipe)));
 	dev_vdbg(hsotg->dev, "  Data buffer length: %d\n",
 		 urb->transfer_buffer_length);
-	dev_vdbg(hsotg->dev, "  Transfer buffer: %p, Transfer DMA: %p\n",
-		 urb->transfer_buffer, (void *)urb->transfer_dma);
-	dev_vdbg(hsotg->dev, "  Setup buffer: %p, Setup DMA: %p\n",
-		 urb->setup_packet, (void *)urb->setup_dma);
+	dev_vdbg(hsotg->dev, "  Transfer buffer: %p, Transfer DMA: %08lx\n",
+		 urb->transfer_buffer, (unsigned long)urb->transfer_dma);
+	dev_vdbg(hsotg->dev, "  Setup buffer: %p, Setup DMA: %08lx\n",
+		 urb->setup_packet, (unsigned long)urb->setup_dma);
 	dev_vdbg(hsotg->dev, "  Interval: %d\n", urb->interval);
 
 	if (usb_pipetype(urb->pipe) == PIPE_ISOCHRONOUS) {
diff --git a/trunk/drivers/staging/dwc2/hcd_intr.c b/trunk/drivers/staging/dwc2/hcd_intr.c
index 01addd0889dc..4b007ab3649b 100644
--- a/trunk/drivers/staging/dwc2/hcd_intr.c
+++ b/trunk/drivers/staging/dwc2/hcd_intr.c
@@ -1535,10 +1535,10 @@ static void dwc2_hc_ahberr_intr(struct dwc2_hsotg *hsotg,
 	dev_err(hsotg->dev, "  Max packet size: %d\n",
 		dwc2_hcd_get_mps(&urb->pipe_info));
 	dev_err(hsotg->dev, "  Data buffer length: %d\n", urb->length);
-	dev_err(hsotg->dev, "  Transfer buffer: %p, Transfer DMA: %p\n",
-		urb->buf, (void *)urb->dma);
-	dev_err(hsotg->dev, "  Setup buffer: %p, Setup DMA: %p\n",
-		urb->setup_packet, (void *)urb->setup_dma);
+	dev_err(hsotg->dev, "  Transfer buffer: %p, Transfer DMA: %08lx\n",
+		urb->buf, (unsigned long)urb->dma);
+	dev_err(hsotg->dev, "  Setup buffer: %p, Setup DMA: %08lx\n",
+		urb->setup_packet, (unsigned long)urb->setup_dma);
 	dev_err(hsotg->dev, "  Interval: %d\n", urb->interval);
 
 	/* Core halts the channel for Descriptor DMA mode */