On Tue, Apr 27, 2010 at 12:34:49AM +0200, Peter Huewe wrote: > From: Peter Huewe <peterhuewe@xxxxxx> > > 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 <peterhuewe@xxxxxx> Acked-by: Simon Horman <horms@xxxxxxxxxxxx> > --- > 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 kernel-janitors" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
