]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
Staging: brcm80211: simplify expression
authorNicolas Kaiser <nikai@nikai.net>
Fri, 29 Oct 2010 22:10:29 +0000 (00:10 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 9 Nov 2010 23:38:25 +0000 (15:38 -0800)
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>
drivers/staging/brcm80211/sys/wlc_mac80211.c

index e7a4bcb1c65a1346f345dd048dee2aad56c4607e..f3e8e3c24276863005c30c550416b4c4c49c394c 100644 (file)
@@ -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));