From patchwork Fri Aug 7 22:26:53 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: When a disk needs to be waken up from sleep, ensure that the command is retried by SCSI EH. From: Gwendal Grignou X-Patchwork-Id: 30989 Message-Id: <1249684013-24307-1-git-send-email-gwendal@google.com> To: tj@kernel.org Cc: jgarzik@pobox.com, linux-ide@vger.kernel.org, Gwendal Grignou Date: Fri, 7 Aug 2009 15:26:53 -0700 --- drivers/ata/libata-eh.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) Acked-by: Tejun Heo diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c index 79711b6..202da9c 100644 --- a/drivers/ata/libata-eh.c +++ b/drivers/ata/libata-eh.c @@ -1183,14 +1183,14 @@ void ata_eh_qc_complete(struct ata_queued_cmd *qc) * should be retried. To be used from EH. * * SCSI midlayer limits the number of retries to scmd->allowed. - * scmd->retries is decremented for commands which get retried + * scmd->allowed is incremented for commands which get retried * due to unrelated failures (qc->err_mask is zero). */ void ata_eh_qc_retry(struct ata_queued_cmd *qc) { struct scsi_cmnd *scmd = qc->scsicmd; - if (!qc->err_mask && scmd->retries) - scmd->retries--; + if (!qc->err_mask) + scmd->allowed++; __ata_eh_qc_complete(qc); }