---

yaml --- r: 235363 b: refs/heads/master c: bbaa387 h: refs/heads/master i: 235361: d9912e5 235359: d4562db v: v3
git-mirror · Mar 1, 2011 · beec2f9 · beec2f9
1 parent f480410
commit beec2f9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a041d8e4375ee6d78409a721221878dcad5eff8a
+refs/heads/master: bbaa387674b65a2f784631cc4c87c77ec9d3374e
diff --git a/trunk/drivers/usb/host/isp1760-hcd.c b/trunk/drivers/usb/host/isp1760-hcd.c
@@ -837,7 +837,6 @@ static void enqueue_one_atl_qtd(struct isp1760_hcd *priv,
 
 	priv->atl_ints[slot].qh = qh;
 	priv->atl_ints[slot].qtd = qtd;
-	priv->atl_ints[slot].data_buffer = qtd->data_buffer;
 	qtd->status |= URB_ENQUEUED;
 	qtd->status |= slot << 16;
 }
@@ -856,7 +855,6 @@ static void enqueue_one_int_qtd(struct isp1760_hcd *priv,
 
 	priv->int_ints[slot].qh = qh;
 	priv->int_ints[slot].qtd = qtd;
-	priv->int_ints[slot].data_buffer = qtd->data_buffer;
 	qtd->status |= URB_ENQUEUED;
 	qtd->status |= slot << 16;
 }
@@ -1147,8 +1145,7 @@ static void do_atl_int(struct usb_hcd *hcd)
 			switch (DW1_GET_PID(ptd.dw1)) {
 			case IN_PID:
 				mem_reads8(hcd->regs, qtd->payload_addr,
-					priv->atl_ints[queue_entry].data_buffer,
-					length);
+						qtd->data_buffer, length);
 
 			case OUT_PID:
 
@@ -1159,7 +1156,6 @@ static void do_atl_int(struct usb_hcd *hcd)
 			}
 		}
 
-		priv->atl_ints[queue_entry].data_buffer = NULL;
 		priv->atl_ints[queue_entry].qtd = NULL;
 		priv->atl_ints[queue_entry].qh = NULL;
 
@@ -1283,8 +1279,7 @@ static void do_intl_int(struct usb_hcd *hcd)
 			switch (DW1_GET_PID(ptd.dw1)) {
 			case IN_PID:
 				mem_reads8(hcd->regs, qtd->payload_addr,
-					priv->int_ints[queue_entry].data_buffer,
-					length);
+						qtd->data_buffer, length);
 			case OUT_PID:
 
 				urb->actual_length += length;
@@ -1294,7 +1289,6 @@ static void do_intl_int(struct usb_hcd *hcd)
 			}
 		}
 
-		priv->int_ints[queue_entry].data_buffer = NULL;
 		priv->int_ints[queue_entry].qtd = NULL;
 		priv->int_ints[queue_entry].qh = NULL;
 
@@ -1700,7 +1694,6 @@ static int isp1760_urb_dequeue(struct usb_hcd *hcd, struct urb *urb,
 
 			ints->qh = NULL;
 			ints->qtd = NULL;
-			ints->data_buffer = NULL;
 
 			isp1760_urb_done(priv, urb, status);
 			if (qtd)

diff --git a/trunk/drivers/usb/host/isp1760-hcd.h b/trunk/drivers/usb/host/isp1760-hcd.h
@@ -107,7 +107,6 @@ struct ptd {
 #define PAYLOAD_OFFSET		0x1000
 
 struct inter_packet_info {
-	void *data_buffer;
 #define PTD_FIRE_NEXT		(1 << 0)
 #define PTD_URB_FINISHED	(1 << 1)
 	struct isp1760_qh *qh;