summaryrefslogtreecommitdiff
path: root/drivers/scsi/imm.c
diff options
context:
space:
mode:
authorMartin K. Petersen <martin.petersen@oracle.com>2019-06-27 00:19:33 -0400
committerMartin K. Petersen <martin.petersen@oracle.com>2019-06-27 00:19:33 -0400
commit893ca250edfcd0489a49446048aa0d900d6862fc (patch)
tree834bd18586b204cce9177a8ba6f8f273f8fa1956 /drivers/scsi/imm.c
parentbaf23eddbf2a4ba9bf2bdb342686c71a8042e39b (diff)
parent3e99b3b13a1fc8f7354edaee4c04f73a07faba69 (diff)
downloadlinux-893ca250edfcd0489a49446048aa0d900d6862fc.tar.gz
linux-893ca250edfcd0489a49446048aa0d900d6862fc.tar.bz2
linux-893ca250edfcd0489a49446048aa0d900d6862fc.zip
Merge branch '5.3/scsi-sg' into scsi-next
Diffstat (limited to 'drivers/scsi/imm.c')
-rw-r--r--drivers/scsi/imm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/imm.c b/drivers/scsi/imm.c
index 64ae418d29f3..56d29f157749 100644
--- a/drivers/scsi/imm.c
+++ b/drivers/scsi/imm.c
@@ -686,7 +686,7 @@ static int imm_completion(struct scsi_cmnd *cmd)
if (cmd->SCp.buffer && !cmd->SCp.this_residual) {
/* if scatter/gather, advance to the next segment */
if (cmd->SCp.buffers_residual--) {
- cmd->SCp.buffer++;
+ cmd->SCp.buffer = sg_next(cmd->SCp.buffer);
cmd->SCp.this_residual =
cmd->SCp.buffer->length;
cmd->SCp.ptr = sg_virt(cmd->SCp.buffer);