diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2021-11-03 21:46:00 -0400 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2021-11-03 21:46:00 -0400 |
| commit | 6266f7df38e167a2386ee2747965c4816f32b449 (patch) | |
| tree | ff3d243efd8c374d2c9686de4a104da71218a952 /drivers/scsi/ufs/ufshcd.c | |
| parent | 5ae17501bc62a49b0b193dcce003f16375f16654 (diff) | |
| parent | 09d9e4d041876684d33f21d02bcdaea6586734f1 (diff) | |
| download | linux-6266f7df38e167a2386ee2747965c4816f32b449.tar.gz linux-6266f7df38e167a2386ee2747965c4816f32b449.tar.bz2 linux-6266f7df38e167a2386ee2747965c4816f32b449.zip | |
Merge branch '5.15/scsi-fixes' into 5.16/scsi-queue
The partial UFS revert in 5.15 is needed for some additional fixes in
the 5.16 SCSI tree. Merge the fixes branch.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/ufs/ufshcd.c')
| -rw-r--r-- | drivers/scsi/ufs/ufshcd.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index f5ba8f953b87..470affdec426 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -2767,12 +2767,7 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd) lrbp->req_abort_skip = false; - err = ufshpb_prep(hba, lrbp); - if (err == -EAGAIN) { - lrbp->cmd = NULL; - ufshcd_release(hba); - goto out; - } + ufshpb_prep(hba, lrbp); ufshcd_comp_scsi_upiu(hba, lrbp); |