diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2023-04-01 04:45:14 +0300 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2023-04-01 04:45:14 +0300 |
| commit | f467b865cf5b25aac3feee3fb5e25b90f5df35c4 (patch) | |
| tree | ee99dbe821c841c979152486537420f13286d3f4 /drivers/scsi/lpfc/lpfc_init.c | |
| parent | 882f4adac9a8411ba9993810132add18896b82c1 (diff) | |
| parent | d684a7a26f7d2c7122a4581ac966ed64e88fb29c (diff) | |
| download | linux-f467b865cf5b25aac3feee3fb5e25b90f5df35c4.tar.xz | |
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/lpfc/lpfc_init.c')
| -rw-r--r-- | drivers/scsi/lpfc/lpfc_init.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c index 756cb0016fc9..a9e36c73cfc5 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c @@ -7290,6 +7290,8 @@ lpfc_sli4_cgn_params_read(struct lpfc_hba *phba) /* Find out if the FW has a new set of congestion parameters. */ len = sizeof(struct lpfc_cgn_param); pdata = kzalloc(len, GFP_KERNEL); + if (!pdata) + return -ENOMEM; ret = lpfc_read_object(phba, (char *)LPFC_PORT_CFG_NAME, pdata, len); |