From: Nicolas Kaiser <nikai@nikai.net>
Date: Fri, 29 Oct 2010 22:10:29 +0000 (+0200)
Subject: Staging: brcm80211: simplify expression
X-Git-Tag: v2.6.38-rc1~423^2~435
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2578f7edf895fd4aad278134452cde1dc1b2fef5;p=karo-tx-linux.git

Staging: brcm80211: simplify expression

Simplify: ((a && b) || !a) => (b || !a)

Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Cc: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.c b/drivers/staging/brcm80211/sys/wlc_mac80211.c
index e7a4bcb1c65a..f3e8e3c24276 100644
--- a/drivers/staging/brcm80211/sys/wlc_mac80211.c
+++ b/drivers/staging/brcm80211/sys/wlc_mac80211.c
@@ -669,7 +669,7 @@ bool wlc_ps_check(wlc_info_t *wlc)
 		 * may be either true or false due to the low level override.
 		 */
 		wake = STAY_AWAKE(wlc);
-		wake_ok = (wake && ((tmp & MCTL_WAKE) != 0)) || !wake;
+		wake_ok = ((tmp & MCTL_WAKE) != 0) || !wake;
 #endif
 		if (hps && !wake_ok) {
 			WL_ERROR(("wl%d: wake not sync, sw %d maccontrol 0x%x\n", wlc->pub->unit, wake, tmp));