diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-02-06 04:36:06 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-06 13:40:59 -0500 |
commit | eaa0ff15c30dc9799eb4d12660edb73aeb6d32c5 (patch) | |
tree | 592ea2010b2e6fb2951e78c21dafc4c2e6fe2134 /drivers/isdn/isdnloop/isdnloop.c | |
parent | 551e4fb2465b87de9d4aa1669b27d624435443bb (diff) |
fix ! versus & precedence in various places
Fix various instances of
if (!expr & mask)
which should probably have been
if (!(expr & mask))
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Peter Osterlund <petero2@telia.com>
Cc: Karsten Keil <kkeil@suse.de>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: Mark Fasheh <mark.fasheh@oracle.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/isdn/isdnloop/isdnloop.c')
-rw-r--r-- | drivers/isdn/isdnloop/isdnloop.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/isdn/isdnloop/isdnloop.c b/drivers/isdn/isdnloop/isdnloop.c index bb92e3cd9334..655ef9a3f4df 100644 --- a/drivers/isdn/isdnloop/isdnloop.c +++ b/drivers/isdn/isdnloop/isdnloop.c | |||
@@ -1184,7 +1184,7 @@ isdnloop_command(isdn_ctrl * c, isdnloop_card * card) | |||
1184 | } | 1184 | } |
1185 | break; | 1185 | break; |
1186 | case ISDN_CMD_DIAL: | 1186 | case ISDN_CMD_DIAL: |
1187 | if (!card->flags & ISDNLOOP_FLAGS_RUNNING) | 1187 | if (!(card->flags & ISDNLOOP_FLAGS_RUNNING)) |
1188 | return -ENODEV; | 1188 | return -ENODEV; |
1189 | if (card->leased) | 1189 | if (card->leased) |
1190 | break; | 1190 | break; |
@@ -1210,7 +1210,7 @@ isdnloop_command(isdn_ctrl * c, isdnloop_card * card) | |||
1210 | } | 1210 | } |
1211 | break; | 1211 | break; |
1212 | case ISDN_CMD_ACCEPTD: | 1212 | case ISDN_CMD_ACCEPTD: |
1213 | if (!card->flags & ISDNLOOP_FLAGS_RUNNING) | 1213 | if (!(card->flags & ISDNLOOP_FLAGS_RUNNING)) |
1214 | return -ENODEV; | 1214 | return -ENODEV; |
1215 | if (c->arg < ISDNLOOP_BCH) { | 1215 | if (c->arg < ISDNLOOP_BCH) { |
1216 | a = c->arg + 1; | 1216 | a = c->arg + 1; |
@@ -1238,7 +1238,7 @@ isdnloop_command(isdn_ctrl * c, isdnloop_card * card) | |||
1238 | } | 1238 | } |
1239 | break; | 1239 | break; |
1240 | case ISDN_CMD_ACCEPTB: | 1240 | case ISDN_CMD_ACCEPTB: |
1241 | if (!card->flags & ISDNLOOP_FLAGS_RUNNING) | 1241 | if (!(card->flags & ISDNLOOP_FLAGS_RUNNING)) |
1242 | return -ENODEV; | 1242 | return -ENODEV; |
1243 | if (c->arg < ISDNLOOP_BCH) { | 1243 | if (c->arg < ISDNLOOP_BCH) { |
1244 | a = c->arg + 1; | 1244 | a = c->arg + 1; |
@@ -1264,7 +1264,7 @@ isdnloop_command(isdn_ctrl * c, isdnloop_card * card) | |||
1264 | i = isdnloop_writecmd(cbuf, strlen(cbuf), 0, card); | 1264 | i = isdnloop_writecmd(cbuf, strlen(cbuf), 0, card); |
1265 | break; | 1265 | break; |
1266 | case ISDN_CMD_HANGUP: | 1266 | case ISDN_CMD_HANGUP: |
1267 | if (!card->flags & ISDNLOOP_FLAGS_RUNNING) | 1267 | if (!(card->flags & ISDNLOOP_FLAGS_RUNNING)) |
1268 | return -ENODEV; | 1268 | return -ENODEV; |
1269 | if (c->arg < ISDNLOOP_BCH) { | 1269 | if (c->arg < ISDNLOOP_BCH) { |
1270 | a = c->arg + 1; | 1270 | a = c->arg + 1; |
@@ -1273,7 +1273,7 @@ isdnloop_command(isdn_ctrl * c, isdnloop_card * card) | |||
1273 | } | 1273 | } |
1274 | break; | 1274 | break; |
1275 | case ISDN_CMD_SETEAZ: | 1275 | case ISDN_CMD_SETEAZ: |
1276 | if (!card->flags & ISDNLOOP_FLAGS_RUNNING) | 1276 | if (!(card->flags & ISDNLOOP_FLAGS_RUNNING)) |
1277 | return -ENODEV; | 1277 | return -ENODEV; |
1278 | if (card->leased) | 1278 | if (card->leased) |
1279 | break; | 1279 | break; |
@@ -1303,7 +1303,7 @@ isdnloop_command(isdn_ctrl * c, isdnloop_card * card) | |||
1303 | } | 1303 | } |
1304 | break; | 1304 | break; |
1305 | case ISDN_CMD_SETL2: | 1305 | case ISDN_CMD_SETL2: |
1306 | if (!card->flags & ISDNLOOP_FLAGS_RUNNING) | 1306 | if (!(card->flags & ISDNLOOP_FLAGS_RUNNING)) |
1307 | return -ENODEV; | 1307 | return -ENODEV; |
1308 | if ((c->arg & 255) < ISDNLOOP_BCH) { | 1308 | if ((c->arg & 255) < ISDNLOOP_BCH) { |
1309 | a = c->arg; | 1309 | a = c->arg; |
@@ -1395,7 +1395,7 @@ if_readstatus(u_char __user *buf, int len, int id, int channel) | |||
1395 | isdnloop_card *card = isdnloop_findcard(id); | 1395 | isdnloop_card *card = isdnloop_findcard(id); |
1396 | 1396 | ||
1397 | if (card) { | 1397 | if (card) { |
1398 | if (!card->flags & ISDNLOOP_FLAGS_RUNNING) | 1398 | if (!(card->flags & ISDNLOOP_FLAGS_RUNNING)) |
1399 | return -ENODEV; | 1399 | return -ENODEV; |
1400 | return (isdnloop_readstatus(buf, len, card)); | 1400 | return (isdnloop_readstatus(buf, len, card)); |
1401 | } | 1401 | } |
@@ -1410,7 +1410,7 @@ if_sendbuf(int id, int channel, int ack, struct sk_buff *skb) | |||
1410 | isdnloop_card *card = isdnloop_findcard(id); | 1410 | isdnloop_card *card = isdnloop_findcard(id); |
1411 | 1411 | ||
1412 | if (card) { | 1412 | if (card) { |
1413 | if (!card->flags & ISDNLOOP_FLAGS_RUNNING) | 1413 | if (!(card->flags & ISDNLOOP_FLAGS_RUNNING)) |
1414 | return -ENODEV; | 1414 | return -ENODEV; |
1415 | /* ack request stored in skb scratch area */ | 1415 | /* ack request stored in skb scratch area */ |
1416 | *(skb->head) = ack; | 1416 | *(skb->head) = ack; |