summaryrefslogtreecommitdiffstats
path: root/drivers/staging/rtl8192e/rtllib_softmac.c
diff options
context:
space:
mode:
authorLarry Finger2011-09-01 19:23:21 +0200
committerGreg Kroah-Hartman2011-09-07 01:36:00 +0200
commitd7613e535e9892ff12aa31b3c62f1be839546ff9 (patch)
tree287ce7f645028d5b351581dd83ff65fc256edb6a /drivers/staging/rtl8192e/rtllib_softmac.c
parentstaging: rtl8192e: Fix smatch warnings regarding large arrays on stack (diff)
downloadkernel-qcow2-linux-d7613e535e9892ff12aa31b3c62f1be839546ff9.tar.gz
kernel-qcow2-linux-d7613e535e9892ff12aa31b3c62f1be839546ff9.tar.xz
kernel-qcow2-linux-d7613e535e9892ff12aa31b3c62f1be839546ff9.zip
staging: rtl8192e: Fix various problems noted by smatch
Smatch reports the following problems: CHECK drivers/staging/rtl8192e/rtllib_softmac.c drivers/staging/rtl8192e/rtllib_softmac.c +3143 rtllib_softmac_free(4) info: redundant null check on ieee->pDot11dInfo calling kfree() CHECK drivers/staging/rtl8192e/rtllib_module.c drivers/staging/rtl8192e/rtllib_module.c +198 free_rtllib(6) info: redundant null check on ieee->pHTInfo calling kfree() CHECK drivers/staging/rtl8192e/rtl819x_TSProc.c drivers/staging/rtl8192e/rtl819x_TSProc.c +280 SearchAdmitTRStream(52) error: potential null derefence 'pRet'. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8192e/rtllib_softmac.c')
-rw-r--r--drivers/staging/rtl8192e/rtllib_softmac.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c
index a420ed1a9479..b5086850f0de 100644
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -3139,10 +3139,8 @@ void rtllib_softmac_init(struct rtllib_device *ieee)
void rtllib_softmac_free(struct rtllib_device *ieee)
{
down(&ieee->wx_sem);
- if (NULL != ieee->pDot11dInfo) {
- kfree(ieee->pDot11dInfo);
- ieee->pDot11dInfo = NULL;
- }
+ kfree(ieee->pDot11dInfo);
+ ieee->pDot11dInfo = NULL;
del_timer_sync(&ieee->associate_timer);
cancel_delayed_work(&ieee->associate_retry_wq);