summaryrefslogtreecommitdiffstats
path: root/drivers/staging/wlan-ng
diff options
context:
space:
mode:
authorDevendra Naga <devendra.aaru@gmail.com>2012-07-14 13:26:59 +0545
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-16 19:21:37 -0700
commit1a46eafe1c4a2bf45928beb280b378f5af904ed9 (patch)
treeb8c2650d22e27b62625cfb46dd739c1bef31d1d9 /drivers/staging/wlan-ng
parent6594ac5dead7ad7cd10103d147eda3190fd49cad (diff)
downloadblackbird-op-linux-1a46eafe1c4a2bf45928beb280b378f5af904ed9.tar.gz
blackbird-op-linux-1a46eafe1c4a2bf45928beb280b378f5af904ed9.zip
staging/wlan-ng: use kzalloc rather using kmalloc at create_wlan
instead we would have used kzalloc, so our memory which is allocated will be set to 0. codepath: the code path here is prism2sta_probe_usb, calling when ever usb-dev id and usb-vendor id e.t.c matches with what ever present in the MODULE_DEVICE_TABLE, and in prism2sta_probe_usb , we call create_wlan, and its called nowhere else... Signed-off-by: Devendra Naga <devendra.aaru@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wlan-ng')
-rw-r--r--drivers/staging/wlan-ng/prism2sta.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/staging/wlan-ng/prism2sta.c b/drivers/staging/wlan-ng/prism2sta.c
index 417aea5e01cd..1dfd9aa5e9fe 100644
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -1947,8 +1947,8 @@ static wlandevice_t *create_wlan(void)
hfa384x_t *hw = NULL;
/* Alloc our structures */
- wlandev = kmalloc(sizeof(wlandevice_t), GFP_KERNEL);
- hw = kmalloc(sizeof(hfa384x_t), GFP_KERNEL);
+ wlandev = kzalloc(sizeof(wlandevice_t), GFP_KERNEL);
+ hw = kzalloc(sizeof(hfa384x_t), GFP_KERNEL);
if (!wlandev || !hw) {
printk(KERN_ERR "%s: Memory allocation failure.\n", dev_info);
@@ -1957,10 +1957,6 @@ static wlandevice_t *create_wlan(void)
return NULL;
}
- /* Clear all the structs */
- memset(wlandev, 0, sizeof(wlandevice_t));
- memset(hw, 0, sizeof(hfa384x_t));
-
/* Initialize the network device object. */
wlandev->nsdname = dev_info;
wlandev->msdstate = WLAN_MSD_HWPRESENT_PENDING;
OpenPOWER on IntegriCloud