ncr5380: Don't re-enter NCR5380_select() when aborting a command

Fixes 707d62b37fbb ("ncr5380: Fix EH during arbitration and selection")

Signed-off-by Finn Thain <[email protected]>

---
 drivers/scsi/NCR5380.c       |    2 +-
 drivers/scsi/atari_NCR5380.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: linux/drivers/scsi/NCR5380.c
===================================================================

drivers/scsi/NCR5380.c +1 -1

@@ -2337,7 +2337,7 @@ static int NCR5380_abort(struct scsi_cmn
 		dsprintk(NDEBUG_ABORT, instance,
 		         "abort: removed %p from disconnected list\n", cmd);
 		cmd->result = DID_ERROR << 16;
-		if (!hostdata->connected)
+		if (!hostdata->connected && !hostdata->selecting)
 			NCR5380_select(instance, cmd);
 		if (hostdata->connected != cmd) {
 			complete_cmd(instance, cmd);

Index: linux/drivers/scsi/atari_NCR5380.c
===================================================================

drivers/scsi/atari_NCR5380.c +1 -2

@@ -2532,7 +2532,7 @@ static int NCR5380_abort(struct scsi_cmn
 		dsprintk(NDEBUG_ABORT, instance,
 		         "abort: removed %p from disconnected list\n", cmd);
 		cmd->result = DID_ERROR << 16;
-		if (!hostdata->connected)
+		if (!hostdata->connected && !hostdata->selecting)
 			NCR5380_select(instance, cmd);
 		if (hostdata->connected != cmd) {
 			complete_cmd(instance, cmd);
 
 
--

To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html