[PATCH 020/117] 53c700: Convert to the scsi_status union

Bart Van Assche
2021-04-20T00:09:25Z

drivers/scsi/53c700.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/53c700.c b/drivers/scsi/53c700.c
index ab42feab233f..dba27011eeee 100644
--- a/drivers/scsi/53c700.c
+++ b/drivers/scsi/53c700.c
@@ -634,7 +634,7 @@ NCR_700_scsi_done(struct NCR_700_Host_Parameters *hostdata,
NCR_700_set_depth(SCp->device, NCR_700_get_depth(SCp->device) - 1);

SCp->host_scribble = NULL;
- SCp->result = result;
+ SCp->status.combined = result;
SCp->scsi_done(SCp);
} else {
printk(KERN_ERR "53c700: SCSI DONE HAS NULL SCp\n");
@@ -1571,7 +1571,7 @@ NCR_700_intr(int irq, void *dev_id)
* command again otherwise we'll
* deadlock on the
* hostdata->state_lock */
- SCp->result = DID_RESET << 16;
+ SCp->status.combined = DID_RESET << 16;
SCp->scsi_done(SCp);
}
mdelay(25);