aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/53c700.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/53c700.c')
-rw-r--r--drivers/scsi/53c700.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/53c700.c b/drivers/scsi/53c700.c
index 523d2a97fd27..e7ad269041a4 100644
--- a/drivers/scsi/53c700.c
+++ b/drivers/scsi/53c700.c
@@ -1427,7 +1427,7 @@ NCR_700_start_command(struct scsi_cmnd *SCp)
1427 * If a contingent allegiance condition exists, the device 1427 * If a contingent allegiance condition exists, the device
1428 * will refuse all tags, so send the request sense as untagged 1428 * will refuse all tags, so send the request sense as untagged
1429 * */ 1429 * */
1430 if((hostdata->tag_negotiated & (1<<SCp->device->id)) 1430 if((hostdata->tag_negotiated & (1<<scmd_id(SCp)))
1431 && (slot->tag != SCSI_NO_TAG && SCp->cmnd[0] != REQUEST_SENSE)) { 1431 && (slot->tag != SCSI_NO_TAG && SCp->cmnd[0] != REQUEST_SENSE)) {
1432 count += scsi_populate_tag_msg(SCp, &hostdata->msgout[count]); 1432 count += scsi_populate_tag_msg(SCp, &hostdata->msgout[count]);
1433 } 1433 }
@@ -1446,7 +1446,7 @@ NCR_700_start_command(struct scsi_cmnd *SCp)
1446 1446
1447 1447
1448 script_patch_ID(hostdata->script, 1448 script_patch_ID(hostdata->script,
1449 Device_ID, 1<<SCp->device->id); 1449 Device_ID, 1<<scmd_id(SCp));
1450 1450
1451 script_patch_32_abs(hostdata->script, CommandAddress, 1451 script_patch_32_abs(hostdata->script, CommandAddress,
1452 slot->pCmd); 1452 slot->pCmd);
@@ -2111,7 +2111,7 @@ static int NCR_700_change_queue_type(struct scsi_device *SDp, int tag_type)
2111 /* shift back to the default unqueued number of commands 2111 /* shift back to the default unqueued number of commands
2112 * (the user can still raise this) */ 2112 * (the user can still raise this) */
2113 scsi_deactivate_tcq(SDp, SDp->host->cmd_per_lun); 2113 scsi_deactivate_tcq(SDp, SDp->host->cmd_per_lun);
2114 hostdata->tag_negotiated &= ~(1 << SDp->id); 2114 hostdata->tag_negotiated &= ~(1 << sdev_id(SDp));
2115 } else { 2115 } else {
2116 /* Here, we cleared the negotiation flag above, so this 2116 /* Here, we cleared the negotiation flag above, so this
2117 * will force the driver to renegotiate */ 2117 * will force the driver to renegotiate */