aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/icn/icn.c
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/icn/icn.c
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/icn/icn.c')
-rw-r--r--drivers/isdn/icn/icn.c22
1 files changed, 11 insertions, 11 deletions
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 }