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

Commit 9f49cf51 authored by Yang Yingliang's avatar Yang Yingliang Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: return error code from rtllib_softmac_init() 



[ Upstream commit 68bf78ff59a0891eb1239948e94ce10f73a9dd30 ]

If it fails to allocate 'dot11d_info', rtllib_softmac_init()
should return error code. And remove unneccessary error message.

Fixes: 94a79942 ("From: wlanfae <wlanfae@realtek.com>")
Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: default avatarPavel Skripkin <paskripkin@gmail.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20211202030704.2425621-2-yangyingliang@huawei.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 84e56853

drivers/staging/rtl8192e/rtllib.h

+1 −1
Original line number Diff line number Diff line
@@ -1982,7 +1982,7 @@ void rtllib_softmac_xmit(struct rtllib_txb *txb, struct rtllib_device *ieee); 
void rtllib_stop_send_beacons(struct rtllib_device *ieee);

void notify_wx_assoc_event(struct rtllib_device *ieee);

void rtllib_start_ibss(struct rtllib_device *ieee);

void rtllib_softmac_init(struct rtllib_device *ieee);

int rtllib_softmac_init(struct rtllib_device *ieee);

void rtllib_softmac_free(struct rtllib_device *ieee);

void rtllib_disassociate(struct rtllib_device *ieee);

void rtllib_stop_scan(struct rtllib_device *ieee);

drivers/staging/rtl8192e/rtllib_softmac.c

+4 −2
Original line number Diff line number Diff line
@@ -2952,7 +2952,7 @@ void rtllib_start_protocol(struct rtllib_device *ieee) 
	}

}



void rtllib_softmac_init(struct rtllib_device *ieee)

int rtllib_softmac_init(struct rtllib_device *ieee)

{

	int i;
@@ -2963,7 +2963,8 @@ void rtllib_softmac_init(struct rtllib_device *ieee) 
		ieee->seq_ctrl[i] = 0;

	ieee->dot11d_info = kzalloc(sizeof(struct rt_dot11d_info), GFP_ATOMIC);

	if (!ieee->dot11d_info)

		netdev_err(ieee->dev, "Can't alloc memory for DOT11D\n");

		return -ENOMEM;



	ieee->LinkDetectInfo.SlotIndex = 0;

	ieee->LinkDetectInfo.SlotNum = 2;

	ieee->LinkDetectInfo.NumRecvBcnInPeriod = 0;
@@ -3031,6 +3032,7 @@ void rtllib_softmac_init(struct rtllib_device *ieee) 
	     (void(*)(unsigned long)) rtllib_sta_ps,

	     (unsigned long)ieee);



	return 0;

}



void rtllib_softmac_free(struct rtllib_device *ieee)