From 8420805072059f215d7b0fff4106df6d3081a053 Mon Sep 17 00:00:00 2001 From: Devendra Naga Date: Sat, 14 Jul 2012 13:26:59 +0545 Subject: [PATCH] --- yaml --- r: 318009 b: refs/heads/master c: 1a46eafe1c4a2bf45928beb280b378f5af904ed9 h: refs/heads/master i: 318007: 112ef5dd50ac84a210ca20d5d4dbb9f80fed8ba3 v: v3 --- [refs] | 2 +- trunk/drivers/staging/wlan-ng/prism2sta.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index f39b971738ab..754b09f60722 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6594ac5dead7ad7cd10103d147eda3190fd49cad +refs/heads/master: 1a46eafe1c4a2bf45928beb280b378f5af904ed9 diff --git a/trunk/drivers/staging/wlan-ng/prism2sta.c b/trunk/drivers/staging/wlan-ng/prism2sta.c index 417aea5e01cd..1dfd9aa5e9fe 100644 --- a/trunk/drivers/staging/wlan-ng/prism2sta.c +++ b/trunk/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;