diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2021-11-04 02:46:00 +0100 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2021-11-04 02:46:00 +0100 |
| commit | 6266f7df38e167a2386ee2747965c4816f32b449 (patch) | |
| tree | ff3d243efd8c374d2c9686de4a104da71218a952 /drivers/scsi/qla2xxx/qla_os.c | |
| parent | scsi: core: Avoid leaving shost->last_reset with stale value if EH does not run (diff) | |
| parent | scsi: ufs: ufshpb: Remove HPB2.0 flows (diff) | |
| download | linux-6266f7df38e167a2386ee2747965c4816f32b449.tar.xz 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/qla2xxx/qla_os.c')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_os.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index e8e93111fede..abcd30917263 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -4151,7 +4151,7 @@ qla2x00_mem_alloc(struct qla_hw_data *ha, uint16_t req_len, uint16_t rsp_len, ql_dbg_pci(ql_dbg_init, ha->pdev, 0xe0ee, "%s: failed alloc dsd\n", __func__); - return 1; + return -ENOMEM; } ha->dif_bundle_kallocs++; |