From 68e70c9844cc98515e4d8647a48992f41bec91e7 Mon Sep 17 00:00:00 2001
From: Andiry Xu <andiry.xu@amd.com>
Date: Mon, 5 Mar 2012 17:49:33 +0800
Subject: [PATCH] --- yaml --- r: 289679 b: refs/heads/master c:
 3fe4fe083d3355537565b2b0a678807513dfa013 h: refs/heads/master i:   289677:
 564eb267f508624197c29f6b46f0b94e3e3ceabe   289675:
 64ee911af9cb8c30d58e9f25a01709cb040a3f1e   289671:
 47f5a6327fecf32e3273166ebbae296108fad0cc   289663:
 bc9c1a20c1363a1fd587b9c4dfb583b244134c2d v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/usb/host/xhci-mem.c | 2 ++
 trunk/drivers/usb/host/xhci.h     | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2168e731bc2e..aacb02e6ebf9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b72fca09d7aed0c1a390370eb3f3f4f0480702a
+refs/heads/master: 3fe4fe083d3355537565b2b0a678807513dfa013
diff --git a/trunk/drivers/usb/host/xhci-mem.c b/trunk/drivers/usb/host/xhci-mem.c
index 1699df9f2568..bdea4de867b4 100644
--- a/trunk/drivers/usb/host/xhci-mem.c
+++ b/trunk/drivers/usb/host/xhci-mem.c
@@ -154,6 +154,7 @@ static struct xhci_ring *xhci_ring_alloc(struct xhci_hcd *xhci,
 	if (!ring)
 		return NULL;
 
+	ring->num_segs = num_segs;
 	INIT_LIST_HEAD(&ring->td_list);
 	ring->type = type;
 	if (num_segs == 0)
@@ -177,6 +178,7 @@ static struct xhci_ring *xhci_ring_alloc(struct xhci_hcd *xhci,
 		num_segs--;
 	}
 	xhci_link_segments(xhci, prev, ring->first_seg, type);
+	ring->last_seg = prev;
 
 	/* Only event ring does not use link TRB */
 	if (type != TYPE_EVENT) {
diff --git a/trunk/drivers/usb/host/xhci.h b/trunk/drivers/usb/host/xhci.h
index eb369a1723b1..2337a8e80b60 100644
--- a/trunk/drivers/usb/host/xhci.h
+++ b/trunk/drivers/usb/host/xhci.h
@@ -1262,6 +1262,7 @@ enum xhci_ring_type {
 
 struct xhci_ring {
 	struct xhci_segment	*first_seg;
+	struct xhci_segment	*last_seg;
 	union  xhci_trb		*enqueue;
 	struct xhci_segment	*enq_seg;
 	unsigned int		enq_updates;
@@ -1276,6 +1277,7 @@ struct xhci_ring {
 	 */
 	u32			cycle_state;
 	unsigned int		stream_id;
+	unsigned int		num_segs;
 	enum xhci_ring_type	type;
 	bool			last_td_was_short;
 };