[PATCH V2 3/3] staging: wilc1000: coreconfigurator.c: fix kmalloc error check
Chaehyun Lim
chaehyun.lim at gmail.com
Thu Jul 23 13:01:19 UTC 2015
Return -ENOMEM if memory allocation is failed.
Signed-off-by: Chaehyun Lim <chaehyun.lim at gmail.com>
---
V2: use ! operator instead of NULL comparison.
drivers/staging/wilc1000/coreconfigurator.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index 9c3ecaa..ff1eb5b 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -675,11 +675,8 @@ s32 CoreConfiguratorInit(void)
sema_init(&SemHandlePktResp, 0);
gps8ConfigPacket = kmalloc(MAX_PACKET_BUFF_SIZE, GFP_ATOMIC);
- if (gps8ConfigPacket == NULL) {
- PRINT_ER("failed in gps8ConfigPacket allocation\n");
- s32Error = WILC_NO_MEM;
- goto _fail_;
- }
+ if (!gps8ConfigPacket)
+ return -ENOMEM;
WILC_memset((void *)gps8ConfigPacket, 0, MAX_PACKET_BUFF_SIZE);
@@ -1032,10 +1029,8 @@ s32 ParseSurveyResults(u8 ppu8RcvdSiteSurveyResults[][MAX_SURVEY_RESULT_FRAG_SIZ
pstrSurveyResults = kmalloc_array(u32SurveyResultsCount,
sizeof(wid_site_survey_reslts_s), GFP_ATOMIC);
- if (pstrSurveyResults == NULL) {
- u32SurveyResultsCount = 0;
- WILC_ERRORREPORT(s32Error, WILC_NO_MEM);
- }
+ if (!pstrSurveyResults)
+ return -ENOMEM;
WILC_memset((void *)(pstrSurveyResults), 0, u32SurveyResultsCount * sizeof(wid_site_survey_reslts_s));
--
1.9.1
More information about the devel
mailing list