Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[mirror_ubuntu-kernels.git] / drivers / staging / rt2860 / rt_linux.c

diff --git a/drivers/staging/rt2860/rt_linux.c b/drivers/staging/rt2860/rt_linux.c
index 728864e18a18df8bfd87816387aa9061e3673c24..e5b0427124301643b9b9bdfeb76863995ab88138 100644 (file)
--- a/drivers/staging/rt2860/rt_linux.c
+++ b/drivers/staging/rt2860/rt_linux.c
@@ -118,8 +118,7 @@ void RTMP_OS_Mod_Timer(struct timer_list *pTimer,
        mod_timer(pTimer, jiffies + timeout);
 }
 
-void RTMP_OS_Del_Timer(struct timer_list *pTimer,
-                      OUT BOOLEAN * pCancelled)
+void RTMP_OS_Del_Timer(struct timer_list *pTimer, OUT BOOLEAN *pCancelled)
 {
        if (timer_pending(pTimer)) {
                *pCancelled = del_timer_sync(pTimer);
@@ -242,8 +241,7 @@ void RTMPFreeAdapter(struct rt_rtmp_adapter *pAd)
 
        os_cookie = (struct os_cookie *)pAd->OS_Cookie;
 
-       if (pAd->BeaconBuf)
-               kfree(pAd->BeaconBuf);
+       kfree(pAd->BeaconBuf);
 
        NdisFreeSpinLock(&pAd->MgmtRingLock);
 
@@ -265,8 +263,7 @@ void RTMPFreeAdapter(struct rt_rtmp_adapter *pAd)
        release_firmware(pAd->firmware);
 
        vfree(pAd);             /* pci_free_consistent(os_cookie->pci_dev,sizeof(struct rt_rtmp_adapter),pAd,os_cookie->pAd_pa); */
-       if (os_cookie)
-               kfree(os_cookie);
+       kfree(os_cookie);
 }
 
 BOOLEAN OS_Need_Clone_Packet(void)