Merge branch 'for-3.1' into for-3.2

[mv-sheeva.git] / drivers / scsi / scsi_lib.c

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 28d9c9d6b4b401f926eb62709efe9027e0d4cfaf..fc3f168decb4606cf479e5b6878236f9cfb5ca24 100644 (file)
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -137,6 +137,7 @@ static int __scsi_queue_insert(struct scsi_cmnd *cmd, int reason, int unbusy)
                host->host_blocked = host->max_host_blocked;
                break;
        case SCSI_MLQUEUE_DEVICE_BUSY:
+       case SCSI_MLQUEUE_EH_RETRY:
                device->device_blocked = device->max_device_blocked;
                break;
        case SCSI_MLQUEUE_TARGET_BUSY: