scsi: megaraid_sas: remove unnecessary kfree
Subsystems (2)
PATCH 1/1 scsi: megaraid_sas: remove unnecessary kfree
When alloc ctrl mem fail, the reply_map will be free in megasas_free_ctrl_mem(), no need to free in megasas_alloc_ctrl_mem().
Signed-off-by Guixin Liu <[email protected]>
--- drivers/scsi/megaraid/megaraid_sas_base.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/scsi/megaraid/megaraid_sas_base.c +2 -6
@@ -7153,22 +7153,18 @@ static int megasas_alloc_ctrl_mem(struct megasas_instance *instance)switch (instance->adapter_type) {case MFI_SERIES :if (megasas_alloc_mfi_ctrl_mem (instance)) - goto fail; +return -ENOMEM ;break ;case AERO_SERIES :case VENTURA_SERIES :case THUNDERBOLT_SERIES :case INVADER_SERIES :if (megasas_alloc_fusion_context (instance)) - goto fail; +return -ENOMEM ;break ; }return 0 ; - fail: -kfree (instance->reply_map); - instance->reply_map =NULL ; -return -ENOMEM ; }/*
Signature · 1 line
1.8.3.1
Hi,
Gentle ping.
Quoted 37 lines · Guixin Liu
When alloc ctrl mem fail, the
reply_mapwill be free inmegasas_free_ctrl_mem(), no need to free inmegasas_alloc_ctrl_mem().Signed-off-by Guixin Liu <[email protected]>--- drivers/scsi/megaraid/megaraid_sas_base.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)drivers/scsi/megaraid/megaraid_sas_base.c +2
-6@@ -7153,22 +7153,18 @@ static int megasas_alloc_ctrl_mem(struct megasas_instance *instance)switch (instance->adapter_type) {case MFI_SERIES :if (megasas_alloc_mfi_ctrl_mem (instance)) - goto fail; +return -ENOMEM ;break ;case AERO_SERIES :case VENTURA_SERIES :case THUNDERBOLT_SERIES :case INVADER_SERIES :if (megasas_alloc_fusion_context (instance)) - goto fail; +return -ENOMEM ;break ; }return 0 ; - fail: -kfree (instance->reply_map); - instance->reply_map =NULL ; -return -ENOMEM ; }/*
Quoted 5 lines · Guixin Liu
When alloc ctrl mem fail, the
reply_mapwill be free inmegasas_free_ctrl_mem(), no need to free inmegasas_alloc_ctrl_mem().Signed-off-by Guixin Liu <[email protected]>
Looks good.
Acked-by Sumit Saxena <[email protected]>
Martin K. Petersen
AppliedGuixin,
Quoted 2 lines
When alloc ctrl mem fail, the
reply_mapwill be free inmegasas_free_ctrl_mem(), no need to free inmegasas_alloc_ctrl_mem().
Applied to 5.20/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering