Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753885Ab0D0IQZ (ORCPT ); Tue, 27 Apr 2010 04:16:25 -0400 Received: from kirsty.vergenet.net ([202.4.237.240]:48408 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752953Ab0D0IQY (ORCPT ); Tue, 27 Apr 2010 04:16:24 -0400 Date: Tue, 27 Apr 2010 18:16:19 +1000 From: Simon Horman To: Peter Huewe Cc: Greg Kroah-Hartman , David Binderman , D Pranith Kumar , Alexander Beregalov , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: Re: [PATCH] staging/otus: Add null check and fix coding style issue Message-ID: <20100427081619.GJ3247@verge.net.au> References: <201004270034.49340.PeterHuewe@gmx.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201004270034.49340.PeterHuewe@gmx.de> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1539 Lines: 47 On Tue, Apr 27, 2010 at 12:34:49AM +0200, Peter Huewe wrote: > From: Peter Huewe > > This patch removes mixing of declarations and code and adds a null-test > after a kmalloc. > > Patch against linux-next as of 20100427 > > Signed-off-by: Peter Huewe Acked-by: Simon Horman > --- > drivers/staging/otus/ioctl.c | 7 +++++-- > 1 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/staging/otus/ioctl.c b/drivers/staging/otus/ioctl.c > index 84be4b2..cface46 100644 > --- a/drivers/staging/otus/ioctl.c > +++ b/drivers/staging/otus/ioctl.c > @@ -867,6 +867,7 @@ int usbdrvwext_giwscan(struct net_device *dev, > char *current_ev = extra; > char *end_buf; > int i; > + struct zsBssListV1 *pBssList; > /* BssList = wd->sta.pBssList; */ > /* zmw_get_wlan_dev(dev); */ > > @@ -874,8 +875,10 @@ int usbdrvwext_giwscan(struct net_device *dev, > return 0; > > /* struct zsBssList BssList; */ > - struct zsBssListV1 *pBssList = kmalloc(sizeof(struct zsBssListV1), > - GFP_KERNEL); > + pBssList = kmalloc(sizeof(struct zsBssListV1), GFP_KERNEL); > + if (pBssList == NULL) > + return -ENOMEM; > + > if (data->length == 0) > end_buf = extra + IW_SCAN_MAX_DATA; > else > -- > 1.6.4.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/