diff --git a/[refs] b/[refs] index d04736f89db3..1d3b90cc5dd7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4dddbc26c3895ecdab1f4b16435685b47f96f599 +refs/heads/master: e47373ec1c9aab9ee134f4e2b8249957e9f4c7ef diff --git a/trunk/drivers/scsi/scsi_error.c b/trunk/drivers/scsi/scsi_error.c index e9c451ba71fc..688bce740786 100644 --- a/trunk/drivers/scsi/scsi_error.c +++ b/trunk/drivers/scsi/scsi_error.c @@ -776,9 +776,11 @@ static int scsi_eh_tur(struct scsi_cmnd *scmd) __FUNCTION__, scmd, rtn)); if (rtn == SUCCESS) return 0; - else if (rtn == NEEDS_RETRY) + else if (rtn == NEEDS_RETRY) { if (retry_cnt--) goto retry_tur; + return 0; + } return 1; }