[PATCH 128/577] Staging: otus: Add null check and fix coding style issue

Greg Kroah-Hartman gregkh at suse.de
Fri May 21 19:57:37 UTC 2010


From: Peter Huewe <peterhuewe at gmx.de>

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

Signed-off-by: Peter Huewe <peterhuewe at gmx.de>
Acked-by: Simon Horman <horms at verge.net.au>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
 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 b9dd943..a48c8e4 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.7.0.3




More information about the devel mailing list