Merge commit 'v2.6.28-rc6' into x86/debug

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 94ed262bdf0..386361778eb 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -1340,9 +1340,10 @@ int scsi_decide_disposition(struct scsi_cmnd *scmd)
                  * LLD/transport was disrupted during processing of the IO.
                  * The transport class is now blocked/blocking,
                  * and the transport will decide what to do with the IO
-                 * based on its timers and recovery capablilities.
+                 * based on its timers and recovery capablilities if
+                 * there are enough retries.
                  */
-                return ADD_TO_MLQUEUE;
+                goto maybe_retry;
         case DID_TRANSPORT_FAILFAST:
                 /*
                  * The transport decided to failfast the IO (most likely