cxlflash: Fix read capacity timeout

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / cxlflash / vlun.c

diff --git a/drivers/scsi/cxlflash/vlun.c b/drivers/scsi/cxlflash/vlun.c
index 6d6608bb4bb0880d55183fcd18452e0dfb601a67..68994c42c81f49fabe2a6a01e67feaf9fd4da522 100644 (file)
--- a/drivers/scsi/cxlflash/vlun.c
+++ b/drivers/scsi/cxlflash/vlun.c
@@ -414,7 +414,7 @@ static int write_same16(struct scsi_device *sdev,
        int ws_limit = SISLITE_MAX_WS_BLOCKS;
        u64 offset = lba;
        int left = nblks;
-       u32 tout = sdev->request_queue->rq_timeout;
+       u32 to = sdev->request_queue->rq_timeout;
        struct cxlflash_cfg *cfg = (struct cxlflash_cfg *)sdev->host->hostdata;
        struct device *dev = &cfg->dev->dev;
 
@@ -434,7 +434,7 @@ static int write_same16(struct scsi_device *sdev,
                                   &scsi_cmd[10]);
 
                result = scsi_execute(sdev, scsi_cmd, DMA_TO_DEVICE, cmd_buf,
-                                     CMD_BUFSIZE, sense_buf, tout, CMD_RETRIES,
+                                     CMD_BUFSIZE, sense_buf, to, CMD_RETRIES,
                                      0, NULL);
                if (result) {
                        dev_err_ratelimited(dev, "%s: command failed for "