Merge upstream kernel changes into 'C/H/S support' branch of libata.

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 184bcaeaf812..5578ae9a9e45 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -638,10 +638,12 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
         }
         spin_unlock_irqrestore(host->host_lock, flags);
         if (rtn) {
-                atomic_inc(&cmd->device->iodone_cnt);
-                scsi_queue_insert(cmd,
-                                (rtn == SCSI_MLQUEUE_DEVICE_BUSY) ?
-                                 rtn : SCSI_MLQUEUE_HOST_BUSY);
+                if (scsi_delete_timer(cmd)) {
+                        atomic_inc(&cmd->device->iodone_cnt);
+                        scsi_queue_insert(cmd,
+                                          (rtn == SCSI_MLQUEUE_DEVICE_BUSY) ?
+                                          rtn : SCSI_MLQUEUE_HOST_BUSY);
+                }
                 SCSI_LOG_MLQUEUE(3,
                     printk("queuecommand : request rejected\n"));
         }