aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2008-02-06 04:36:06 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-06 13:40:59 -0500
commiteaa0ff15c30dc9799eb4d12660edb73aeb6d32c5 (patch)
tree592ea2010b2e6fb2951e78c21dafc4c2e6fe2134 /drivers/isdn
parent551e4fb2465b87de9d4aa1669b27d624435443bb (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')
-rw-r--r--drivers/isdn/act2000/module.c22
-rw-r--r--drivers/isdn/i4l/isdn_ttyfax.c2
-rw-r--r--drivers/isdn/icn/icn.c22
-rw-r--r--drivers/isdn/isdnloop/isdnloop.c16
4 files changed, 31 insertions, 31 deletions
diff --git a/drivers/isdn/act2000/module.c b/drivers/isdn/act2000/module.c
index ee2b0b9f8f46..8325022e2bed 100644
--- a/drivers/isdn/act2000/module.c
+++ b/drivers/isdn/act2000/module.c
@@ -310,7 +310,7 @@ act2000_command(act2000_card * card, isdn_ctrl * c)
310 } 310 }
311 break; 311 break;
312 case ISDN_CMD_DIAL: 312 case ISDN_CMD_DIAL:
313 if (!card->flags & ACT2000_FLAGS_RUNNING) 313 if (!(card->flags & ACT2000_FLAGS_RUNNING))
314 return -ENODEV; 314 return -ENODEV;
315 if (!(chan = find_channel(card, c->arg & 0x0f))) 315 if (!(chan = find_channel(card, c->arg & 0x0f)))
316 break; 316 break;
@@ -339,7 +339,7 @@ act2000_command(act2000_card * card, isdn_ctrl * c)
339 } 339 }
340 return ret; 340 return ret;
341 case ISDN_CMD_ACCEPTD: 341 case ISDN_CMD_ACCEPTD:
342 if (!card->flags & ACT2000_FLAGS_RUNNING) 342 if (!(card->flags & ACT2000_FLAGS_RUNNING))
343 return -ENODEV; 343 return -ENODEV;
344 if (!(chan = find_channel(card, c->arg & 0x0f))) 344 if (!(chan = find_channel(card, c->arg & 0x0f)))
345 break; 345 break;
@@ -347,11 +347,11 @@ act2000_command(act2000_card * card, isdn_ctrl * c)
347 actcapi_select_b2_protocol_req(card, chan); 347 actcapi_select_b2_protocol_req(card, chan);
348 return 0; 348 return 0;
349 case ISDN_CMD_ACCEPTB: 349 case ISDN_CMD_ACCEPTB:
350 if (!card->flags & ACT2000_FLAGS_RUNNING) 350 if (!(card->flags & ACT2000_FLAGS_RUNNING))
351 return -ENODEV; 351 return -ENODEV;
352 return 0; 352 return 0;
353 case ISDN_CMD_HANGUP: 353 case ISDN_CMD_HANGUP:
354 if (!card->flags & ACT2000_FLAGS_RUNNING) 354 if (!(card->flags & ACT2000_FLAGS_RUNNING))
355 return -ENODEV; 355 return -ENODEV;
356 if (!(chan = find_channel(card, c->arg & 0x0f))) 356 if (!(chan = find_channel(card, c->arg & 0x0f)))
357 break; 357 break;
@@ -366,7 +366,7 @@ act2000_command(act2000_card * card, isdn_ctrl * c)
366 } 366 }
367 return 0; 367 return 0;
368 case ISDN_CMD_SETEAZ: 368 case ISDN_CMD_SETEAZ:
369 if (!card->flags & ACT2000_FLAGS_RUNNING) 369 if (!(card->flags & ACT2000_FLAGS_RUNNING))
370 return -ENODEV; 370 return -ENODEV;
371 if (!(chan = find_channel(card, c->arg & 0x0f))) 371 if (!(chan = find_channel(card, c->arg & 0x0f)))
372 break; 372 break;
@@ -386,7 +386,7 @@ act2000_command(act2000_card * card, isdn_ctrl * c)
386 actcapi_listen_req(card); 386 actcapi_listen_req(card);
387 return 0; 387 return 0;
388 case ISDN_CMD_CLREAZ: 388 case ISDN_CMD_CLREAZ:
389 if (!card->flags & ACT2000_FLAGS_RUNNING) 389 if (!(card->flags & ACT2000_FLAGS_RUNNING))
390 return -ENODEV; 390 return -ENODEV;
391 if (!(chan = find_channel(card, c->arg & 0x0f))) 391 if (!(chan = find_channel(card, c->arg & 0x0f)))
392 break; 392 break;
@@ -394,14 +394,14 @@ act2000_command(act2000_card * card, isdn_ctrl * c)
394 actcapi_listen_req(card); 394 actcapi_listen_req(card);
395 return 0; 395 return 0;
396 case ISDN_CMD_SETL2: 396 case ISDN_CMD_SETL2:
397 if (!card->flags & ACT2000_FLAGS_RUNNING) 397 if (!(card->flags & ACT2000_FLAGS_RUNNING))
398 return -ENODEV; 398 return -ENODEV;
399 if (!(chan = find_channel(card, c->arg & 0x0f))) 399 if (!(chan = find_channel(card, c->arg & 0x0f)))
400 break; 400 break;
401 chan->l2prot = (c->arg >> 8); 401 chan->l2prot = (c->arg >> 8);
402 return 0; 402 return 0;
403 case ISDN_CMD_SETL3: 403 case ISDN_CMD_SETL3:
404 if (!card->flags & ACT2000_FLAGS_RUNNING) 404 if (!(card->flags & ACT2000_FLAGS_RUNNING))
405 return -ENODEV; 405 return -ENODEV;
406 if ((c->arg >> 8) != ISDN_PROTO_L3_TRANS) { 406 if ((c->arg >> 8) != ISDN_PROTO_L3_TRANS) {
407 printk(KERN_WARNING "L3 protocol unknown\n"); 407 printk(KERN_WARNING "L3 protocol unknown\n");
@@ -524,7 +524,7 @@ if_writecmd(const u_char __user *buf, int len, int id, int channel)
524 act2000_card *card = act2000_findcard(id); 524 act2000_card *card = act2000_findcard(id);
525 525
526 if (card) { 526 if (card) {
527 if (!card->flags & ACT2000_FLAGS_RUNNING) 527 if (!(card->flags & ACT2000_FLAGS_RUNNING))
528 return -ENODEV; 528 return -ENODEV;
529 return (len); 529 return (len);
530 } 530 }
@@ -539,7 +539,7 @@ if_readstatus(u_char __user * buf, int len, int id, int channel)
539 act2000_card *card = act2000_findcard(id); 539 act2000_card *card = act2000_findcard(id);
540 540
541 if (card) { 541 if (card) {
542 if (!card->flags & ACT2000_FLAGS_RUNNING) 542 if (!(card->flags & ACT2000_FLAGS_RUNNING))
543 return -ENODEV; 543 return -ENODEV;
544 return (act2000_readstatus(buf, len, card)); 544 return (act2000_readstatus(buf, len, card));
545 } 545 }
@@ -554,7 +554,7 @@ if_sendbuf(int id, int channel, int ack, struct sk_buff *skb)
554 act2000_card *card = act2000_findcard(id); 554 act2000_card *card = act2000_findcard(id);
555 555
556 if (card) { 556 if (card) {
557 if (!card->flags & ACT2000_FLAGS_RUNNING) 557 if (!(card->flags & ACT2000_FLAGS_RUNNING))
558 return -ENODEV; 558 return -ENODEV;
559 return (act2000_sendbuf(card, channel, ack, skb)); 559 return (act2000_sendbuf(card, channel, ack, skb));
560 } 560 }
diff --git a/drivers/isdn/i4l/isdn_ttyfax.c b/drivers/isdn/i4l/isdn_ttyfax.c
index a943d078bacc..f93de4a30355 100644
--- a/drivers/isdn/i4l/isdn_ttyfax.c
+++ b/drivers/isdn/i4l/isdn_ttyfax.c
@@ -834,7 +834,7 @@ isdn_tty_cmd_FCLASS2(char **p, modem_info * info)
834 char *rp = &f->resolution; 834 char *rp = &f->resolution;
835 835
836 p[0] += 2; 836 p[0] += 2;
837 if (!info->faxonline & 1) /* not outgoing connection */ 837 if (!(info->faxonline & 1)) /* not outgoing connection */
838 PARSE_ERROR1; 838 PARSE_ERROR1;
839 839
840 for (i = 0; (((*p[0] >= '0') && (*p[0] <= '9')) || (*p[0] == ',')) && (i < 4); i++) { 840 for (i = 0; (((*p[0] >= '0') && (*p[0] <= '9')) || (*p[0] == ',')) && (i < 4); i++) {
diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
index 82d957bde299..bf7997abc4ac 100644
--- a/drivers/isdn/icn/icn.c
+++ b/drivers/isdn/icn/icn.c
@@ -1302,7 +1302,7 @@ icn_command(isdn_ctrl * c, icn_card * card)
1302 } 1302 }
1303 break; 1303 break;
1304 case ISDN_CMD_DIAL: 1304 case ISDN_CMD_DIAL:
1305 if (!card->flags & ICN_FLAGS_RUNNING) 1305 if (!(card->flags & ICN_FLAGS_RUNNING))
1306 return -ENODEV; 1306 return -ENODEV;
1307 if (card->leased) 1307 if (card->leased)
1308 break; 1308 break;
@@ -1328,7 +1328,7 @@ icn_command(isdn_ctrl * c, icn_card * card)
1328 } 1328 }
1329 break; 1329 break;
1330 case ISDN_CMD_ACCEPTD: 1330 case ISDN_CMD_ACCEPTD:
1331 if (!card->flags & ICN_FLAGS_RUNNING) 1331 if (!(card->flags & ICN_FLAGS_RUNNING))
1332 return -ENODEV; 1332 return -ENODEV;
1333 if (c->arg < ICN_BCH) { 1333 if (c->arg < ICN_BCH) {
1334 a = c->arg + 1; 1334 a = c->arg + 1;
@@ -1348,7 +1348,7 @@ icn_command(isdn_ctrl * c, icn_card * card)
1348 } 1348 }
1349 break; 1349 break;
1350 case ISDN_CMD_ACCEPTB: 1350 case ISDN_CMD_ACCEPTB:
1351 if (!card->flags & ICN_FLAGS_RUNNING) 1351 if (!(card->flags & ICN_FLAGS_RUNNING))
1352 return -ENODEV; 1352 return -ENODEV;
1353 if (c->arg < ICN_BCH) { 1353 if (c->arg < ICN_BCH) {
1354 a = c->arg + 1; 1354 a = c->arg + 1;
@@ -1366,7 +1366,7 @@ icn_command(isdn_ctrl * c, icn_card * card)
1366 } 1366 }
1367 break; 1367 break;
1368 case ISDN_CMD_HANGUP: 1368 case ISDN_CMD_HANGUP:
1369 if (!card->flags & ICN_FLAGS_RUNNING) 1369 if (!(card->flags & ICN_FLAGS_RUNNING))
1370 return -ENODEV; 1370 return -ENODEV;
1371 if (c->arg < ICN_BCH) { 1371 if (c->arg < ICN_BCH) {
1372 a = c->arg + 1; 1372 a = c->arg + 1;
@@ -1375,7 +1375,7 @@ icn_command(isdn_ctrl * c, icn_card * card)
1375 } 1375 }
1376 break; 1376 break;
1377 case ISDN_CMD_SETEAZ: 1377 case ISDN_CMD_SETEAZ:
1378 if (!card->flags & ICN_FLAGS_RUNNING) 1378 if (!(card->flags & ICN_FLAGS_RUNNING))
1379 return -ENODEV; 1379 return -ENODEV;
1380 if (card->leased) 1380 if (card->leased)
1381 break; 1381 break;
@@ -1391,7 +1391,7 @@ icn_command(isdn_ctrl * c, icn_card * card)
1391 } 1391 }
1392 break; 1392 break;
1393 case ISDN_CMD_CLREAZ: 1393 case ISDN_CMD_CLREAZ:
1394 if (!card->flags & ICN_FLAGS_RUNNING) 1394 if (!(card->flags & ICN_FLAGS_RUNNING))
1395 return -ENODEV; 1395 return -ENODEV;
1396 if (card->leased) 1396 if (card->leased)
1397 break; 1397 break;
@@ -1405,7 +1405,7 @@ icn_command(isdn_ctrl * c, icn_card * card)
1405 } 1405 }
1406 break; 1406 break;
1407 case ISDN_CMD_SETL2: 1407 case ISDN_CMD_SETL2:
1408 if (!card->flags & ICN_FLAGS_RUNNING) 1408 if (!(card->flags & ICN_FLAGS_RUNNING))
1409 return -ENODEV; 1409 return -ENODEV;
1410 if ((c->arg & 255) < ICN_BCH) { 1410 if ((c->arg & 255) < ICN_BCH) {
1411 a = c->arg; 1411 a = c->arg;
@@ -1424,7 +1424,7 @@ icn_command(isdn_ctrl * c, icn_card * card)
1424 } 1424 }
1425 break; 1425 break;
1426 case ISDN_CMD_SETL3: 1426 case ISDN_CMD_SETL3:
1427 if (!card->flags & ICN_FLAGS_RUNNING) 1427 if (!(card->flags & ICN_FLAGS_RUNNING))
1428 return -ENODEV; 1428 return -ENODEV;
1429 return 0; 1429 return 0;
1430 default: 1430 default:
@@ -1471,7 +1471,7 @@ if_writecmd(const u_char __user *buf, int len, int id, int channel)
1471 icn_card *card = icn_findcard(id); 1471 icn_card *card = icn_findcard(id);
1472 1472
1473 if (card) { 1473 if (card) {
1474 if (!card->flags & ICN_FLAGS_RUNNING) 1474 if (!(card->flags & ICN_FLAGS_RUNNING))
1475 return -ENODEV; 1475 return -ENODEV;
1476 return (icn_writecmd(buf, len, 1, card)); 1476 return (icn_writecmd(buf, len, 1, card));
1477 } 1477 }
@@ -1486,7 +1486,7 @@ if_readstatus(u_char __user *buf, int len, int id, int channel)
1486 icn_card *card = icn_findcard(id); 1486 icn_card *card = icn_findcard(id);
1487 1487
1488 if (card) { 1488 if (card) {
1489 if (!card->flags & ICN_FLAGS_RUNNING) 1489 if (!(card->flags & ICN_FLAGS_RUNNING))
1490 return -ENODEV; 1490 return -ENODEV;
1491 return (icn_readstatus(buf, len, card)); 1491 return (icn_readstatus(buf, len, card));
1492 } 1492 }
@@ -1501,7 +1501,7 @@ if_sendbuf(int id, int channel, int ack, struct sk_buff *skb)
1501 icn_card *card = icn_findcard(id); 1501 icn_card *card = icn_findcard(id);
1502 1502
1503 if (card) { 1503 if (card) {
1504 if (!card->flags & ICN_FLAGS_RUNNING) 1504 if (!(card->flags & ICN_FLAGS_RUNNING))
1505 return -ENODEV; 1505 return -ENODEV;
1506 return (icn_sendbuf(channel, ack, skb, card)); 1506 return (icn_sendbuf(channel, ack, skb, card));
1507 } 1507 }
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;
generated by cgit v1.2.2 (git 2.25.0) at 2024-09-22 10:22:27 -0400