From adea51ff42e11b39c65fdaf069b8b6f33c25eb5f Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Fri, 30 Nov 2012 11:54:45 +0100
Subject: [PATCH] --- yaml --- r: 354557 b: refs/heads/master c:
 f8be6bfc5da027952e827a503e747fde5393adcc h: refs/heads/master i:   354555:
 3bf3ca99de2ec022dcb534cce6ff00180bf25445 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/usb/storage/uas.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 00db0c7ef1b4..c82c694d6b7c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c456971f8c90b8179bf5fd5ae2d9b734085c19d
+refs/heads/master: f8be6bfc5da027952e827a503e747fde5393adcc
diff --git a/trunk/drivers/usb/storage/uas.c b/trunk/drivers/usb/storage/uas.c
index 547f96acad9c..ebb99728551c 100644
--- a/trunk/drivers/usb/storage/uas.c
+++ b/trunk/drivers/usb/storage/uas.c
@@ -644,6 +644,12 @@ static int uas_queuecommand_lck(struct scsi_cmnd *cmnd,
 
 	BUILD_BUG_ON(sizeof(struct uas_cmd_info) > sizeof(struct scsi_pointer));
 
+	if (devinfo->resetting) {
+		cmnd->result = DID_ERROR << 16;
+		cmnd->scsi_done(cmnd);
+		return 0;
+	}
+
 	spin_lock_irqsave(&devinfo->lock, flags);
 	if (devinfo->cmnd) {
 		spin_unlock_irqrestore(&devinfo->lock, flags);