projects
/
platform
/
upstream
/
kernel-adaptation-pc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a28792e
)
Staging: brcm80211: simplify expression
author
Nicolas Kaiser
<nikai@nikai.net>
Fri, 29 Oct 2010 22:10:29 +0000
(
00:10
+0200)
committer
Greg 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
patch
|
blob
|
history
diff --git
a/drivers/staging/brcm80211/sys/wlc_mac80211.c
b/drivers/staging/brcm80211/sys/wlc_mac80211.c
index
e7a4bcb
..
f3e8e3c
100644
(file)
--- 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));