[PATCH 2/2] staging: wilc1000: fix memory allocation error check
Chaehyun Lim
chaehyun.lim at gmail.com
Tue Jul 14 01:48:41 UTC 2015
Remove WILC_ERRORREPORT macro. If memory allocation is failed,
jump to a label to return this function with WILC_NO_MEM.
Signed-off-by: Chaehyun Lim <chaehyun.lim at gmail.com>
---
drivers/staging/wilc1000/host_interface.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index ca97b70..f6ba7d1 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -7142,8 +7142,11 @@ s32 host_int_add_beacon(WILC_WFIDrvHandle hWFIDrv, u32 u32Interval,
/* Bug 4599 : if tail length = 0 skip allocating & copying */
if (u32TailLen > 0) {
pstrSetBeaconParam->pu8Tail = (u8 *)WILC_MALLOC(u32TailLen);
- if (pstrSetBeaconParam->pu8Tail == NULL)
- WILC_ERRORREPORT(s32Error, WILC_NO_MEM);
+ if (pstrSetBeaconParam->pu8Tail == NULL) {
+ PRINT_ER("Failed to allocate memory\n");
+ s32Error = WILC_NO_MEM;
+ goto _fail_;
+ }
WILC_memcpy(pstrSetBeaconParam->pu8Tail, pu8Tail, u32TailLen);
} else {
pstrSetBeaconParam->pu8Tail = NULL;
--
1.9.1
More information about the devel
mailing list