Skip to content

Commit 0141618

Browse files
Thomas-fouriermartinkpetersen
authored andcommitted
scsi: mvsas: Fix dma_unmap_sg() nents value
The dma_unmap_sg() functions should be called with the same nents as the dma_map_sg(), not the value the map function returned. Fixes: b576294 ("[SCSI] mvsas: Add Marvell 6440 SAS/SATA driver") Signed-off-by: Thomas Fourier <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Martin K. Petersen <[email protected]>
1 parent 3a988d0 commit 0141618

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/scsi/mvsas/mv_sas.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,7 @@ static int mvs_task_prep(struct sas_task *task, struct mvs_info *mvi, int is_tmf
818818
dev_printk(KERN_ERR, mvi->dev, "mvsas prep failed[%d]!\n", rc);
819819
if (!sas_protocol_ata(task->task_proto))
820820
if (n_elem)
821-
dma_unmap_sg(mvi->dev, task->scatter, n_elem,
821+
dma_unmap_sg(mvi->dev, task->scatter, task->num_scatter,
822822
task->data_dir);
823823
prep_out:
824824
return rc;
@@ -864,7 +864,7 @@ static void mvs_slot_task_free(struct mvs_info *mvi, struct sas_task *task,
864864
if (!sas_protocol_ata(task->task_proto))
865865
if (slot->n_elem)
866866
dma_unmap_sg(mvi->dev, task->scatter,
867-
slot->n_elem, task->data_dir);
867+
task->num_scatter, task->data_dir);
868868

869869
switch (task->task_proto) {
870870
case SAS_PROTOCOL_SMP:

0 commit comments

Comments
 (0)