diff options
author | Martin K. Petersen <martin.petersen@oracle.com> | 2021-04-06 04:57:29 +0200 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2021-04-06 04:57:29 +0200 |
commit | 556666bce111b2a758010c2a2a6bab7f3770f4de (patch) | |
tree | 3a35ea6f9a9aa43b82166afc1f329084dd55c729 /drivers/scsi/qedi | |
parent | scsi: message: mptlan: Replace one-element array with flexible-array member (diff) | |
parent | scsi: iscsi: Fix race condition between login and sync thread (diff) | |
download | linux-556666bce111b2a758010c2a2a6bab7f3770f4de.tar.xz linux-556666bce111b2a758010c2a2a6bab7f3770f4de.zip |
Merge branch '5.12/scsi-fixes' into 5.13/scsi-staging
Pull 5.12/scsi-fixes into the 5.13 SCSI tree to provide a baseline for
some UFS changes that would otherwise cause conflicts during the
merge.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/qedi')
-rw-r--r-- | drivers/scsi/qedi/qedi_main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/qedi/qedi_main.c b/drivers/scsi/qedi/qedi_main.c index faf77808a3a7..2455d1448a7e 100644 --- a/drivers/scsi/qedi/qedi_main.c +++ b/drivers/scsi/qedi/qedi_main.c @@ -1673,6 +1673,7 @@ static int qedi_alloc_global_queues(struct qedi_ctx *qedi) if (!qedi->global_queues[i]) { QEDI_ERR(&qedi->dbg_ctx, "Unable to allocation global queue %d.\n", i); + status = -ENOMEM; goto mem_alloc_failure; } |