Skip to content

Commit

Permalink
[PATCH] prism54: replace kmalloc+memset with kzalloc
Browse files Browse the repository at this point in the history
Replace kmalloc+memset with kzalloc

Signed-off-by: Yan Burman <burman.yan@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Yan Burman authored and John W. Linville committed Dec 6, 2006
1 parent b0471bb commit b950e83
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 deletions.
9 changes: 3 additions & 6 deletions drivers/net/wireless/prism54/isl_ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -2140,11 +2140,9 @@ prism54_wpa_bss_ie_add(islpci_private *priv, u8 *bssid,
struct islpci_bss_wpa_ie, list);
list_del(&bss->list);
} else {
bss = kmalloc(sizeof (*bss), GFP_ATOMIC);
if (bss != NULL) {
bss = kzalloc(sizeof (*bss), GFP_ATOMIC);
if (bss != NULL)
priv->num_bss_wpa++;
memset(bss, 0, sizeof (*bss));
}
}
if (bss != NULL) {
memcpy(bss->bssid, bssid, ETH_ALEN);
Expand Down Expand Up @@ -2684,11 +2682,10 @@ prism2_ioctl_set_generic_element(struct net_device *ndev,
return -EINVAL;

alen = sizeof(*attach) + len;
attach = kmalloc(alen, GFP_KERNEL);
attach = kzalloc(alen, GFP_KERNEL);
if (attach == NULL)
return -ENOMEM;

memset(attach, 0, alen);
#define WLAN_FC_TYPE_MGMT 0
#define WLAN_FC_STYPE_ASSOC_REQ 0
#define WLAN_FC_STYPE_REASSOC_REQ 2
Expand Down
4 changes: 1 addition & 3 deletions drivers/net/wireless/prism54/oid_mgt.c
Original file line number Diff line number Diff line change
Expand Up @@ -235,12 +235,10 @@ mgt_init(islpci_private *priv)
{
int i;

priv->mib = kmalloc(OID_NUM_LAST * sizeof (void *), GFP_KERNEL);
priv->mib = kcalloc(OID_NUM_LAST, sizeof (void *), GFP_KERNEL);
if (!priv->mib)
return -ENOMEM;

memset(priv->mib, 0, OID_NUM_LAST * sizeof (void *));

/* Alloc the cache */
for (i = 0; i < OID_NUM_LAST; i++) {
if (isl_oid[i].flags & OID_FLAG_CACHED) {
Expand Down

0 comments on commit b950e83

Please sign in to comment.