From dcc45b5cd41e7c3ca5854ec780cf0431ecd30769 Mon Sep 17 00:00:00 2001
From: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Date: Fri, 2 Dec 2011 11:55:46 -0800
Subject: [PATCH] --- yaml --- r: 289412 b: refs/heads/master c:
 9eb445410db99e5f5f660e97a2165a0567bd909e h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/usb/storage/uas.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a1fc8744fe62..89a410d7850c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea9da1c79eb9a28176550d0b8ba9166e6e5f42b8
+refs/heads/master: 9eb445410db99e5f5f660e97a2165a0567bd909e
diff --git a/trunk/drivers/usb/storage/uas.c b/trunk/drivers/usb/storage/uas.c
index 4bbaf6e150e4..28d9b1909389 100644
--- a/trunk/drivers/usb/storage/uas.c
+++ b/trunk/drivers/usb/storage/uas.c
@@ -343,7 +343,10 @@ static struct urb *uas_alloc_cmd_urb(struct uas_dev_info *devinfo, gfp_t gfp,
 		goto free;
 
 	iu->iu_id = IU_ID_COMMAND;
-	iu->tag = cpu_to_be16(stream_id);
+	if (blk_rq_tagged(cmnd->request))
+		iu->tag = cpu_to_be16(cmnd->request->tag + 1);
+	else
+		iu->tag = cpu_to_be16(1);
 	iu->prio_attr = UAS_SIMPLE_TAG;
 	iu->len = len;
 	int_to_scsilun(sdev->lun, &iu->lun);