summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Kaiser <nikai@nikai.net>2010-10-30 00:10:29 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2010-11-09 15:38:25 -0800
commit2578f7edf895fd4aad278134452cde1dc1b2fef5 (patch)
tree83e2897d08a032cccc49271213cc54029b1adaf1
parenta28792e78669dc1bb984dd7798f0bccda741acbb (diff)
downloadop-kernel-dev-2578f7edf895fd4aad278134452cde1dc1b2fef5.zip
op-kernel-dev-2578f7edf895fd4aad278134452cde1dc1b2fef5.tar.gz
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>
-rw-r--r--drivers/staging/brcm80211/sys/wlc_mac80211.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.c b/drivers/staging/brcm80211/sys/wlc_mac80211.c
index e7a4bcb..f3e8e3c 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));
OpenPOWER on IntegriCloud