diff options
| author | David S. Miller | 2017-08-07 19:42:09 +0200 |
|---|---|---|
| committer | David S. Miller | 2017-08-07 19:42:09 +0200 |
| commit | fde6af4729b005dc9dc936b0ed9f1b27b5b2d0f4 (patch) | |
| tree | fb52e170a7b2130b8a5266ac665d4314447fef95 /drivers/scsi/megaraid/megaraid_sas_fusion.c | |
| parent | Merge branch 'net-sched-summer-cleanup-part-2-ndo_setup_tc' (diff) | |
| parent | net/mlx5: Increase the maximum flow counters supported (diff) | |
| download | kernel-qcow2-linux-fde6af4729b005dc9dc936b0ed9f1b27b5b2d0f4.tar.gz kernel-qcow2-linux-fde6af4729b005dc9dc936b0ed9f1b27b5b2d0f4.tar.xz kernel-qcow2-linux-fde6af4729b005dc9dc936b0ed9f1b27b5b2d0f4.zip | |
Merge tag 'mlx5-shared-2017-08-07' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux
Saeed Mahameed says:
====================
mlx5-shared-2017-08-07
This series includes some mlx5 updates for both net-next and rdma trees.
From Saeed,
Core driver updates to allow selectively building the driver with
or without some large driver components, such as
- E-Switch (Ethernet SRIOV support).
- Multi-Physical Function Switch (MPFs) support.
For that we split E-Switch and MPFs functionalities into separate files.
From Erez,
Delay mlx5_core events when mlx5 interfaces, namely mlx5_ib, registration
is taking place and until it completes.
From Rabie,
Increase the maximum supported flow counters.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/scsi/megaraid/megaraid_sas_fusion.c')
| -rw-r--r-- | drivers/scsi/megaraid/megaraid_sas_fusion.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c index f990ab4d45e1..985510628f56 100644 --- a/drivers/scsi/megaraid/megaraid_sas_fusion.c +++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c @@ -425,7 +425,7 @@ static int megasas_create_sg_sense_fusion(struct megasas_instance *instance) int megasas_alloc_cmdlist_fusion(struct megasas_instance *instance) { - u32 max_mpt_cmd, i; + u32 max_mpt_cmd, i, j; struct fusion_context *fusion; fusion = instance->ctrl_context; @@ -450,11 +450,15 @@ megasas_alloc_cmdlist_fusion(struct megasas_instance *instance) fusion->cmd_list[i] = kzalloc(sizeof(struct megasas_cmd_fusion), GFP_KERNEL); if (!fusion->cmd_list[i]) { + for (j = 0; j < i; j++) + kfree(fusion->cmd_list[j]); + kfree(fusion->cmd_list); dev_err(&instance->pdev->dev, "Failed from %s %d\n", __func__, __LINE__); return -ENOMEM; } } + return 0; } int |