aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2009-07-27 21:59:48 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-15 12:02:06 -0700
commit2e9ab1e72c631041f8a1c1d1fc7e5359e7e4a476 (patch)
treee406613de660461b9b5c45f4b27595501b3d5cf7
parent658ce9d653056a537df70e3a796654446fc9ff64 (diff)
Staging: Correct use of ! and &
Correct priority problem in the use of ! and &. The semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // <smpl> @@ expression E; constant C; @@ - !E & C + !(E & C) // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/rt3090/sta_ioctl.c6
-rw-r--r--drivers/staging/vt6656/iwctl.c3
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/staging/rt3090/sta_ioctl.c b/drivers/staging/rt3090/sta_ioctl.c
index 93efd7f..b8ab84a 100644
--- a/drivers/staging/rt3090/sta_ioctl.c
+++ b/drivers/staging/rt3090/sta_ioctl.c
@@ -1840,10 +1840,8 @@ int rt_ioctl_siwencode(struct net_device *dev,
}
else
/* Don't complain if only change the mode */
- if(!erq->flags & IW_ENCODE_MODE)
- {
- return -EINVAL;
- }
+ if (!(erq->flags & IW_ENCODE_MODE))
+ return -EINVAL;
}
done:
diff --git a/drivers/staging/vt6656/iwctl.c b/drivers/staging/vt6656/iwctl.c
index e4fdb6f..96f2a78 100644
--- a/drivers/staging/vt6656/iwctl.c
+++ b/drivers/staging/vt6656/iwctl.c
@@ -1409,8 +1409,7 @@ int iwctl_siwencode(struct net_device *dev,
// Do we want to just set the transmit key index ?
if ( index < 4 ) {
pDevice->byKeyIndex = index;
- }
- else if(!wrq->flags & IW_ENCODE_MODE) {
+ } else if (!(wrq->flags & IW_ENCODE_MODE)) {
rc = -EINVAL;
return rc;
}