Merge branch 'ipmi' (ipmi patches from Corey Minyard)

[cascardo/linux.git] / drivers / staging / vt6655 / power.c

diff --git a/drivers/staging/vt6655/power.c b/drivers/staging/vt6655/power.c
index 2340d2f..4bd1ccb 100644 (file)
--- a/drivers/staging/vt6655/power.c
+++ b/drivers/staging/vt6655/power.c
@@ -260,7 +260,7 @@ PSvSendPSPOLL(
                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;
 }
@@ -284,16 +284,15 @@ PSbSendNullPacket(
        PSMgmtObject        pMgmt = pDevice->pMgmt;
        unsigned int uIdx;
 
-       if (pDevice->bLinkPass == false) {
+       if (!pDevice->bLinkPass) {
                return false;
        }
 #ifdef TxInSleep
-       if ((pDevice->bEnablePSMode == false) &&
-           (pDevice->fTxDataInSleep == false)) {
+       if (!pDevice->bEnablePSMode && !pDevice->fTxDataInSleep) {
                return false;
        }
 #else
-       if (pDevice->bEnablePSMode == false) {
+       if (!pDevice->bEnablePSMode) {
                return false;
        }
 #endif