Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SCSI fixes on 20250920 

One driver fix for a dma error checking thinko.
 
 Signed-off-by: James E.J. Bottomley <James.Bottomley@HansenPartnership.com>
 -----BEGIN PGP SIGNATURE-----
 
 iLgEABMIAGAWIQTnYEDbdso9F2cI+arnQslM7pishQUCaM7RqhsUgAAAAAAEAA5t
 YW51MiwyLjUrMS4xMSwyLDImHGphbWVzLmJvdHRvbWxleUBoYW5zZW5wYXJ0bmVy
 c2hpcC5jb20ACgkQ50LJTO6YrIXidgEAyXqRDw3Vune8kX3/aSSijXdAnCo9nDSl
 xIpAPmQg8qIA/2StUFuc9W6Z2hhdW2YUlwNMR9nCBDi2/yUv/XoS/Eah
 =yK2v
 -----END PGP SIGNATURE-----

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull SCSI fix from James Bottomley:
 "One driver fix for a dma error checking thinko"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: ufs: mcq: Fix memory allocation checks for SQE and CQE
This commit is contained in:
Linus Torvalds 2025-09-20 19:48:16 -07:00
parent 0f46486981 5cb782ff3c
commit fce24200cb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/ufs/core/ufs-mcq.c
View File

@ -243,7 +243,7 @@ int ufshcd_mcq_memory_alloc(struct ufs_hba *hba)
hwq->sqe_base_addr = dmam_alloc_coherent(hba->dev, utrdl_size, hwq->sqe_base_addr = dmam_alloc_coherent(hba->dev, utrdl_size,
&hwq->sqe_dma_addr, &hwq->sqe_dma_addr,
GFP_KERNEL); GFP_KERNEL);
if (!hwq->sqe_dma_addr) { if (!hwq->sqe_base_addr) {
dev_err(hba->dev, "SQE allocation failed\n"); dev_err(hba->dev, "SQE allocation failed\n");
return -ENOMEM; return -ENOMEM;
} }
@ -252,7 +252,7 @@ int ufshcd_mcq_memory_alloc(struct ufs_hba *hba)
hwq->cqe_base_addr = dmam_alloc_coherent(hba->dev, cqe_size, hwq->cqe_base_addr = dmam_alloc_coherent(hba->dev, cqe_size,
&hwq->cqe_dma_addr, &hwq->cqe_dma_addr,
GFP_KERNEL); GFP_KERNEL);
if (!hwq->cqe_dma_addr) { if (!hwq->cqe_base_addr) {
dev_err(hba->dev, "CQE allocation failed\n"); dev_err(hba->dev, "CQE allocation failed\n");
return -ENOMEM; return -ENOMEM;
} }