From 0ef5738d0e8a368182b897e6c27cc30f35320185 Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Wed, 26 Sep 2012 10:29:03 +0200
Subject: [PATCH] --- yaml --- r: 326145 b: refs/heads/master c:
 e0423dee897734576cf4cc021165dd4521e9d3cc h: refs/heads/master i:   326143:
 789f8720fc74c8e8d7bf101a5578e7b3b25b336c v: v3

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

diff --git a/[refs] b/[refs]
index c656a917c3ac..6a9651a3f827 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1994ff405e9c1a8916ca41e093e786262af42b42
+refs/heads/master: e0423dee897734576cf4cc021165dd4521e9d3cc
diff --git a/trunk/drivers/usb/storage/uas.c b/trunk/drivers/usb/storage/uas.c
index 4218701bb45e..98b98eef7527 100644
--- a/trunk/drivers/usb/storage/uas.c
+++ b/trunk/drivers/usb/storage/uas.c
@@ -249,16 +249,18 @@ static void uas_stat_cmplt(struct urb *urb)
 		cmnd = devinfo->cmnd;
 	else
 		cmnd = scsi_host_find_tag(shost, tag - 1);
+
 	if (!cmnd) {
-		if (iu->iu_id != IU_ID_RESPONSE) {
-			usb_free_urb(urb);
-			spin_unlock_irqrestore(&devinfo->lock, flags);
-			return;
+		if (iu->iu_id == IU_ID_RESPONSE) {
+			/* store results for uas_eh_task_mgmt() */
+			memcpy(&devinfo->response, iu, sizeof(devinfo->response));
 		}
-	} else {
-		cmdinfo = (void *)&cmnd->SCp;
+		usb_free_urb(urb);
+		spin_unlock_irqrestore(&devinfo->lock, flags);
+		return;
 	}
 
+	cmdinfo = (void *)&cmnd->SCp;
 	switch (iu->iu_id) {
 	case IU_ID_STATUS:
 		if (devinfo->cmnd == cmnd)
@@ -292,10 +294,6 @@ static void uas_stat_cmplt(struct urb *urb)
 	case IU_ID_WRITE_READY:
 		uas_xfer_data(urb, cmnd, SUBMIT_DATA_OUT_URB);
 		break;
-	case IU_ID_RESPONSE:
-		/* store results for uas_eh_task_mgmt() */
-		memcpy(&devinfo->response, iu, sizeof(devinfo->response));
-		break;
 	default:
 		scmd_printk(KERN_ERR, cmnd,
 			"Bogus IU (%d) received on status pipe\n", iu->iu_id);