Commit 07035651 authored by Finn Thain's avatar Finn Thain Committed by Martin K. Petersen
Browse files

scsi: NCR5380: Use DRIVER_SENSE to indicate valid sense data 



When sense data is valid, call set_driver_byte(cmd, DRIVER_SENSE).  Otherwise
some callers of scsi_execute() will ignore sense data.  Don't set DID_ERROR or
DID_RESET just because sense data is missing.

Tested-by: default avatarMichael Schmitz <schmitzmic@gmail.com>
Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 7c8ed783

drivers/scsi/NCR5380.c

+4 −5
Original line number Diff line number Diff line
@@ -513,11 +513,12 @@ static void complete_cmd(struct Scsi_Host *instance, 


	if (hostdata->sensing == cmd) {

		/* Autosense processing ends here */

		if ((cmd->result & 0xff) != SAM_STAT_GOOD) {

		if (status_byte(cmd->result) != GOOD) {

			scsi_eh_restore_cmnd(cmd, &hostdata->ses);

			set_host_byte(cmd, DID_ERROR);

		} else

		} else {

			scsi_eh_restore_cmnd(cmd, &hostdata->ses);

			set_driver_byte(cmd, DRIVER_SENSE);

		}

		hostdata->sensing = NULL;

	}
@@ -2273,7 +2274,6 @@ static int NCR5380_abort(struct scsi_cmnd *cmd) 
	if (list_del_cmd(&hostdata->autosense, cmd)) {

		dsprintk(NDEBUG_ABORT, instance,

		         "abort: removed %p from sense queue\n", cmd);

		set_host_byte(cmd, DID_ERROR);

		complete_cmd(instance, cmd);

	}
@@ -2352,7 +2352,6 @@ static int NCR5380_host_reset(struct scsi_cmnd *cmd) 
	list_for_each_entry(ncmd, &hostdata->autosense, list) {

		struct scsi_cmnd *cmd = NCR5380_to_scmd(ncmd);



		set_host_byte(cmd, DID_RESET);

		cmd->scsi_done(cmd);

	}

	INIT_LIST_HEAD(&hostdata->autosense);