From d160a00d5eaf2a206762fc35cbe4084b64b7c079 Mon Sep 17 00:00:00 2001 From: Brian King Date: Thu, 29 Mar 2007 15:25:52 -0500 Subject: [PATCH] --- yaml --- r: 53694 b: refs/heads/master c: ed773e66480fdcd06732eb2aa39362599dcd67fa h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/scsi_error.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1e433cfc61d9..6d574d743477 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 18a6598f2d3bb7275dadba77df5f06bc996a77d4 +refs/heads/master: ed773e66480fdcd06732eb2aa39362599dcd67fa diff --git a/trunk/drivers/scsi/scsi_error.c b/trunk/drivers/scsi/scsi_error.c index 7a1a1bb1341e..28a266c804be 100644 --- a/trunk/drivers/scsi/scsi_error.c +++ b/trunk/drivers/scsi/scsi_error.c @@ -932,10 +932,12 @@ static int scsi_eh_try_stu(struct scsi_cmnd *scmd) static unsigned char stu_command[6] = {START_STOP, 0, 0, 0, 1, 0}; if (scmd->device->allow_restart) { - int rtn; + int i, rtn = NEEDS_RETRY; + + for (i = 0; rtn == NEEDS_RETRY && i < 2; i++) + rtn = scsi_send_eh_cmnd(scmd, stu_command, 6, + START_UNIT_TIMEOUT, 0); - rtn = scsi_send_eh_cmnd(scmd, stu_command, 6, - START_UNIT_TIMEOUT, 0); if (rtn == SUCCESS) return 0; }