[PATCH 014/117] ch: Pass union scsi_status to driver_byte()

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

drivers/scsi/ch.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/ch.c b/drivers/scsi/ch.c
index cb74ab1ae5a4..663af5ed20de 100644
--- a/drivers/scsi/ch.c
+++ b/drivers/scsi/ch.c
@@ -187,7 +187,8 @@ ch_do_scsi(scsi_changer *ch, unsigned char *cmd, int cmd_len,
void *buffer, unsigned buflength,
enum dma_data_direction direction)
{
- int errno, retries = 0, timeout, result;
+ int errno, retries = 0, timeout;
+ union scsi_status result;
struct scsi_sense_hdr sshdr;

timeout = (cmd[0] == INITIALIZE_ELEMENT_STATUS)
@@ -195,7 +196,7 @@ ch_do_scsi(scsi_changer *ch, unsigned char *cmd, int cmd_len,

retry:
errno = 0;
- result = scsi_execute_req(ch->device, cmd, direction, buffer,
+ result.combined = scsi_execute_req(ch->device, cmd, direction, buffer,
buflength, &sshdr, timeout * HZ,
MAX_RETRIES, NULL);