---

yaml --- r: 236208 b: refs/heads/master c: e25b75e h: refs/heads/master v: v3
git-mirror · Mar 2, 2011 · 2981fc6 · 2981fc6
1 parent 2ca254a
commit 2981fc6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 036dba14d56fd3d43bab452625ec967c3f886fa4
+refs/heads/master: e25b75ec83ec1d76690a9f26d457d2af945119d2
diff --git a/trunk/drivers/staging/vt6656/power.c b/trunk/drivers/staging/vt6656/power.c
@@ -130,7 +130,6 @@ void PSvEnablePowerSaving(void *hDeviceContext,
 
 	pDevice->bPWBitOn = TRUE;
 	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "PS:Power Saving Mode Enable... \n");
-	return;
 }
 
 /*
@@ -163,7 +162,6 @@ void PSvDisablePowerSaving(void *hDeviceContext)
 		PSbSendNullPacket(pDevice);
 
 	pDevice->bPWBitOn = FALSE;
-	return;
 }
 
 /*
@@ -255,13 +253,10 @@ void PSvSendPSPOLL(void *hDeviceContext)
 	pTxPacket->cbMPDULen = WLAN_HDR_ADDR2_LEN;
 	pTxPacket->cbPayloadLen = 0;
 
-	/* send the frame */
+	/* log failure if sending failed */
 	if (csMgmt_xmit(pDevice, pTxPacket) != CMD_STATUS_PENDING) {
 		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Send PS-Poll packet failed..\n");
-	} else {
-		/* DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Send PS-Poll packet success..\n"); */
-	};
-	return;
+	}
 }
 
 /*
@@ -316,15 +311,12 @@ BOOL PSbSendNullPacket(void *hDeviceContext)
 	memcpy(pTxPacket->p80211Header->sA3.abyAddr3, pMgmt->abyCurrBSSID, WLAN_BSSID_LEN);
 	pTxPacket->cbMPDULen = WLAN_HDR_ADDR3_LEN;
 	pTxPacket->cbPayloadLen = 0;
-	/* send the frame */
+	/* log error if sending failed */
 	if (csMgmt_xmit(pDevice, pTxPacket) != CMD_STATUS_PENDING) {
 		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Send Null Packet failed !\n");
 		return FALSE;
-	} else {
-		/* DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Send Null Packet success....\n"); */
 	}
-
-	return TRUE ;
+	return TRUE;
 }
 
 /*