From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail.linuxfoundation.org ([140.211.169.12]:41920 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753504AbbGNVQS (ORCPT ); Tue, 14 Jul 2015 17:16:18 -0400 Date: Tue, 14 Jul 2015 14:16:18 -0700 From: Greg KH To: Chaehyun Lim Cc: johnny.kim@atmel.com, rachel.kim@atmel.com, dean.lee@atmel.com, chris.park@atmel.com, linux-wireless@vger.kernel.org, devel@driverdev.osuosl.org Subject: Re: [PATCH 2/2] staging: wilc1000: fix memory allocation error check Message-ID: <20150714211618.GB11675@kroah.com> (sfid-20150714_231625_937807_F11C99CE) References: <1436838521-8200-1-git-send-email-chaehyun.lim@gmail.com> <1436838521-8200-2-git-send-email-chaehyun.lim@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <1436838521-8200-2-git-send-email-chaehyun.lim@gmail.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: On Tue, Jul 14, 2015 at 10:48:41AM +0900, Chaehyun Lim wrote: > 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 > --- > 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"); This message is redundant, the core already just told the user this, so it's not needed to tell them this again. And as an aside, the mess in WILC_MALLOC() needs to go as well, that's horrid, and wrong :( thanks, greg k-h