---

yaml --- r: 141278 b: refs/heads/master c: f72c4bf h: refs/heads/master v: v3
git-mirror · Apr 3, 2009 · 25d577a · 25d577a
1 parent 90a2a23
commit 25d577a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed291e8051ee418de7ccd3507c1e783323fd1c35
+refs/heads/master: f72c4bf5e184353bd848b9b6de87fe2b07a3066c
diff --git a/trunk/drivers/staging/rt2860/common/mlme.c b/trunk/drivers/staging/rt2860/common/mlme.c
@@ -897,7 +897,7 @@ VOID MlmePeriodicExec(
 		{
 			if ((pAd->StaCfg.bRadio == TRUE) && (pAd->SameRxByteCount < 700))
 			{
-				DBGPRINT(RT_DEBUG_TRACE, ("--->  SameRxByteCount = %d !!!!!!!!!!!!!!! \n", pAd->SameRxByteCount));
+				DBGPRINT(RT_DEBUG_TRACE, ("--->  SameRxByteCount = %lu !!!!!!!!!!!!!!! \n", pAd->SameRxByteCount));
 				pAd->SameRxByteCount = 700;
 				AsicResetBBP(pAd);
 			}

diff --git a/trunk/drivers/staging/rt2860/common/rtmp_init.c b/trunk/drivers/staging/rt2860/common/rtmp_init.c
@@ -2046,7 +2046,7 @@ VOID NICRestoreBBPValue(
 	IN PRTMP_ADAPTER pAd)
 {
 	UCHAR		index;
-	UCHAR		Value;
+	UCHAR		Value = 0;
 	ULONG		Data;
 
 	DBGPRINT(RT_DEBUG_TRACE, ("--->  NICRestoreBBPValue !!!!!!!!!!!!!!!!!!!!!!!  \n"));

diff --git a/trunk/drivers/staging/rt2860/sta_ioctl.c b/trunk/drivers/staging/rt2860/sta_ioctl.c
@@ -358,7 +358,7 @@ VOID RTMPAddKey(
 		if (pAd->StaCfg.bRadio == FALSE)
 		{
 			RTMP_SET_PSFLAG(pAd, fRTMP_PS_CAN_GO_SLEEP);
-			return (NDIS_STATUS_SUCCESS);
+			return;
 		}
 		DBGPRINT(RT_DEBUG_TRACE,("RTMPWPAAddKeyProc1==>\n"));
 		RTMPPCIeLinkCtrlValueRestore(pAd, RESTORE_HALT);
@@ -2465,7 +2465,7 @@ void fnSetCipherKey(
 		if (pAdapter->StaCfg.bRadio == FALSE)
 		{
 			RTMP_SET_PSFLAG(pAdapter, fRTMP_PS_CAN_GO_SLEEP);
-			return (NDIS_STATUS_SUCCESS);
+			return;
 		}
 		DBGPRINT(RT_DEBUG_TRACE,("RTMPWPAAddKeyProc1==>\n"));
 		RTMPPCIeLinkCtrlValueRestore(pAdapter, RESTORE_HALT);