Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b950e83b authored by Yan Burman's avatar Yan Burman Committed by John W. Linville
Browse files

[PATCH] prism54: replace kmalloc+memset with kzalloc 



Replace kmalloc+memset with kzalloc

Signed-off-by: default avatarYan Burman <burman.yan@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b0471bb7

drivers/net/wireless/prism54/isl_ioctl.c

+3 −6
Original line number Diff line number Diff line
@@ -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);
@@ -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

drivers/net/wireless/prism54/oid_mgt.c

+1 −3
Original line number Diff line number Diff line
@@ -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) {