diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2023-03-31 21:45:14 -0400 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2023-03-31 21:45:14 -0400 |
| commit | f467b865cf5b25aac3feee3fb5e25b90f5df35c4 (patch) | |
| tree | ee99dbe821c841c979152486537420f13286d3f4 /drivers/scsi/mpi3mr/mpi3mr_app.c | |
| parent | 882f4adac9a8411ba9993810132add18896b82c1 (diff) | |
| parent | d684a7a26f7d2c7122a4581ac966ed64e88fb29c (diff) | |
| download | linux-stable-f467b865cf5b25aac3feee3fb5e25b90f5df35c4.tar.gz linux-stable-f467b865cf5b25aac3feee3fb5e25b90f5df35c4.tar.bz2 linux-stable-f467b865cf5b25aac3feee3fb5e25b90f5df35c4.zip | |
Merge branch '6.3/scsi-fixes' into 6.4/scsi-staging
Pull in the fixes branch to resolve an mpi3mr conflict reported by
sfr.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/mpi3mr/mpi3mr_app.c')
| -rw-r--r-- | drivers/scsi/mpi3mr/mpi3mr_app.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/mpi3mr/mpi3mr_app.c b/drivers/scsi/mpi3mr/mpi3mr_app.c index 0bd1fd628206..08645a99ad6b 100644 --- a/drivers/scsi/mpi3mr/mpi3mr_app.c +++ b/drivers/scsi/mpi3mr/mpi3mr_app.c @@ -886,7 +886,7 @@ static int mpi3mr_build_nvme_prp(struct mpi3mr_ioc *mrioc, * each time through the loop. */ *prp_entry = cpu_to_le64(dma_addr); - if (*prp1_entry & sgemod_mask) { + if (*prp_entry & sgemod_mask) { dprint_bsg_err(mrioc, "%s: PRP address collides with SGE modifier\n", __func__); @@ -895,7 +895,7 @@ static int mpi3mr_build_nvme_prp(struct mpi3mr_ioc *mrioc, *prp_entry &= ~sgemod_mask; *prp_entry |= sgemod_val; prp_entry++; - prp_entry_dma++; + prp_entry_dma += prp_size; } /* |