Skip to contentSkip to conversation

staging: rtl8712: use kcalloc instead of kmalloc(x*y,...)

PATCH In review Vitaly Osipov 2 participants 2 messages Jun 14, 2014 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 2/2 staging: rtl8712: use kcalloc instead of kmalloc(x*y,...)

Replaced kmalloc(x*y, ...) with kcalloc(x,y,...)

---
 drivers/staging/rtl8712/rtl871x_mlme.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/staging/rtl8712/rtl871x_mlme.c +1 -2
index 26b8f37..8561841 100644
@@ -62,8 +62,7 @@ static sint _init_mlme_priv(struct _adapter *padapter)
 	_init_queue(&(pmlmepriv->scanned_queue));
 	set_scanned_network_val(pmlmepriv, 0);
 	memset(&pmlmepriv->assoc_ssid, 0, sizeof(struct ndis_802_11_ssid));
-	pbuf = kmalloc(MAX_BSS_CNT * (sizeof(struct wlan_network)),
-		       GFP_ATOMIC);
+	pbuf = kcalloc(MAX_BSS_CNT, sizeof(struct wlan_network), GFP_ATOMIC);
 	if (pbuf == NULL)
 		return _FAIL;
 	pmlmepriv->free_bss_buf = pbuf;
Signature · 1 line
1.9.1
#1 lore raw

Re: [PATCH 2/2] staging: rtl8712: use kcalloc instead of kmalloc(x*y, ...)

Quoted 12 lines · Vitaly Osipov

Replaced kmalloc(x*y, ...) with kcalloc(x,y,...)

---
 drivers/staging/rtl8712/rtl871x_mlme.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/staging/rtl8712/rtl871x_mlme.c +0 -0
index 26b8f37..8561841 100644

drivers/staging/rtl8712/rtl871x_mlme.c static sint _init_mlme_priv(struct _adapter *padapter) · line 65

Quoted 6 lines
drivers/staging/rtl8712/rtl871x_mlme.c +1 -2
@@ -62,8 +62,7 @@ static sint _init_mlme_priv(struct _adapter *padapter)
        _init_queue(&(pmlmepriv->scanned_queue));
        set_scanned_network_val(pmlmepriv, 0);
        memset(&pmlmepriv->assoc_ssid, 0, sizeof(struct ndis_802_11_ssid));
-       pbuf = kmalloc(MAX_BSS_CNT * (sizeof(struct wlan_network)),
-                      GFP_ATOMIC);
+       pbuf = kcalloc(MAX_BSS_CNT, sizeof(struct wlan_network), GFP_ATOMIC);

kcalloc() additionally zeroes the memory, so this is a change in behaviour. A better replacement would be kmalloc_array().

Jonas