Commit 3e67274a authored by Nishka Dasgupta's avatar Nishka Dasgupta Committed by Greg Kroah-Hartman
Browse files

staging: rtl8712: r8712_init_mlme_priv(): Change return values 



Change return values of r8712_init_mlme_priv from _SUCCESS/_FAIL to
0/-ENOMEM respectively. Modify call site accordingly.

Signed-off-by: default avatarNishka Dasgupta <nishkadg.linux@gmail.com>
Link: https://lore.kernel.org/r/20190722092341.21030-1-nishkadg.linux@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ec2b26f7

drivers/staging/rtl8712/os_intfs.c

+1 −1
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ u8 r8712_init_drv_sw(struct _adapter *padapter) 
	padapter->cmdpriv.padapter = padapter;

	if (r8712_init_evt_priv(&padapter->evtpriv))

		return _FAIL;

	if (r8712_init_mlme_priv(padapter) == _FAIL)

	if (r8712_init_mlme_priv(padapter))

		return _FAIL;

	_r8712_init_xmit_priv(&padapter->xmitpriv, padapter);

	_r8712_init_recv_priv(&padapter->recvpriv, padapter);

drivers/staging/rtl8712/rtl871x_mlme.c

+2 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ int r8712_init_mlme_priv(struct _adapter *padapter) 
	pbuf = kmalloc_array(MAX_BSS_CNT, sizeof(struct wlan_network),

			     GFP_ATOMIC);

	if (!pbuf)

		return _FAIL;

		return -ENOMEM;

	pmlmepriv->free_bss_buf = pbuf;

	pnetwork = (struct wlan_network *)pbuf;

	for (i = 0; i < MAX_BSS_CNT; i++) {
@@ -67,7 +67,7 @@ int r8712_init_mlme_priv(struct _adapter *padapter) 
	pmlmepriv->sitesurveyctrl.traffic_busy = false;

	/* allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf */

	r8712_init_mlme_timer(padapter);

	return _SUCCESS;

	return 0;

}



struct wlan_network *_r8712_alloc_network(struct mlme_priv *pmlmepriv)

CRA Git | Maintained and supported by SUSTech CRA and CCSE