From: Gerd Hoffmann <kraxel@redhat.com>
Date: Fri, 30 Nov 2012 10:54:45 +0000 (+0100)
Subject: uas: fail any request submitted while resetting the device.
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=f8be6bfc5da027952e827a503e747fde5393adcc;p=deliverable%2Flinux.git

uas: fail any request submitted while resetting the device.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c
index 547f96acad9c..ebb99728551c 100644
--- a/drivers/usb/storage/uas.c
+++ b/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);