From: Peter Huewe <peterhuewe@gmx.de>
Date: Mon, 26 Apr 2010 22:34:49 +0000 (+0200)
Subject: Staging: otus: Add null check and fix coding style issue
X-Git-Tag: MMI-PSA29.97-13-9~23841^2^2~449
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f4d52b072d35ad2cc3720af65853e6fcc9d8414f;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Staging: otus: Add null check and fix coding style issue

This patch removes mixing of declarations and code and adds a null-test
after a kmalloc.

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Acked-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/otus/ioctl.c b/drivers/staging/otus/ioctl.c
index b9dd943e07a1..a48c8e4a9ea7 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