Commit dce20067 authored Nov 27, 2005 by Vasily Averin Committed by James Bottomley Nov 28, 2005

[SCSI] aic7xxx: reset handler selects a wrong command

To transport scsi reset command to device aic7xxx reset handler looks
at the driver's pending_list and searches any proper command. However
the search condition has been inverted: ahc_match_scb() returns TRUE
if a matched command is found. As a result the reset on required
devices did not turn out well, a correctly working neighbour device
may be surprised by the reset. aic7xxx reset handler reports about the
success, but really the original situation is not corrected yet.

Signed-off-by: Vasily Averin <vvs@sw.ru>

Naturally, there's a corresponding problem in the aic79xx driver, so
I've also added the same fix for that.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

parent 458af543

drivers/scsi/aic7xxx/aic79xx_osm.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2105,7 +2105,7 @@ ahd_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag)
		scmd_id(cmd),
		scmd_channel(cmd) + 'A',
		CAM_LUN_WILDCARD,
		SCB_LIST_NULL, ROLE_INITIATOR) == 0)
		SCB_LIST_NULL, ROLE_INITIATOR))
		break;
		}
		}

drivers/scsi/aic7xxx/aic7xxx_osm.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2169,7 +2169,7 @@ ahc_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag)
		if (ahc_match_scb(ahc, pending_scb, scmd_id(cmd),
		scmd_channel(cmd) + 'A',
		CAM_LUN_WILDCARD,
		SCB_LIST_NULL, ROLE_INITIATOR) == 0)
		SCB_LIST_NULL, ROLE_INITIATOR))
		break;
		}
		}