tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Alexey Dobriyan and committed by
Linus Torvalds eaa0ff15 551e4fb2

+36 -36
+1 -1
drivers/block/paride/pt.c
··· 660 660 pt_identify(tape); 661 661 662 662 err = -ENODEV; 663 - if (!tape->flags & PT_MEDIA) 663 + if (!(tape->flags & PT_MEDIA)) 664 664 goto out; 665 665 666 666 err = -EROFS;
+2 -2
drivers/block/pktcdvd.c
··· 2212 2212 return ret; 2213 2213 } 2214 2214 2215 - if (!buf[6] & 0x40) { 2215 + if (!(buf[6] & 0x40)) { 2216 2216 printk(DRIVER_NAME": Disc type is not CD-RW\n"); 2217 2217 return 1; 2218 2218 } 2219 - if (!buf[6] & 0x4) { 2219 + if (!(buf[6] & 0x4)) { 2220 2220 printk(DRIVER_NAME": A1 values on media are not valid, maybe not CDRW?\n"); 2221 2221 return 1; 2222 2222 }
+11 -11
drivers/isdn/act2000/module.c
··· 310 310 } 311 311 break; 312 312 case ISDN_CMD_DIAL: 313 - if (!card->flags & ACT2000_FLAGS_RUNNING) 313 + if (!(card->flags & ACT2000_FLAGS_RUNNING)) 314 314 return -ENODEV; 315 315 if (!(chan = find_channel(card, c->arg & 0x0f))) 316 316 break; ··· 339 339 } 340 340 return ret; 341 341 case ISDN_CMD_ACCEPTD: 342 - if (!card->flags & ACT2000_FLAGS_RUNNING) 342 + if (!(card->flags & ACT2000_FLAGS_RUNNING)) 343 343 return -ENODEV; 344 344 if (!(chan = find_channel(card, c->arg & 0x0f))) 345 345 break; ··· 347 347 actcapi_select_b2_protocol_req(card, chan); 348 348 return 0; 349 349 case ISDN_CMD_ACCEPTB: 350 - if (!card->flags & ACT2000_FLAGS_RUNNING) 350 + if (!(card->flags & ACT2000_FLAGS_RUNNING)) 351 351 return -ENODEV; 352 352 return 0; 353 353 case ISDN_CMD_HANGUP: 354 - if (!card->flags & ACT2000_FLAGS_RUNNING) 354 + if (!(card->flags & ACT2000_FLAGS_RUNNING)) 355 355 return -ENODEV; 356 356 if (!(chan = find_channel(card, c->arg & 0x0f))) 357 357 break; ··· 366 366 } 367 367 return 0; 368 368 case ISDN_CMD_SETEAZ: 369 - if (!card->flags & ACT2000_FLAGS_RUNNING) 369 + if (!(card->flags & ACT2000_FLAGS_RUNNING)) 370 370 return -ENODEV; 371 371 if (!(chan = find_channel(card, c->arg & 0x0f))) 372 372 break; ··· 386 386 actcapi_listen_req(card); 387 387 return 0; 388 388 case ISDN_CMD_CLREAZ: 389 - if (!card->flags & ACT2000_FLAGS_RUNNING) 389 + if (!(card->flags & ACT2000_FLAGS_RUNNING)) 390 390 return -ENODEV; 391 391 if (!(chan = find_channel(card, c->arg & 0x0f))) 392 392 break; ··· 394 394 actcapi_listen_req(card); 395 395 return 0; 396 396 case ISDN_CMD_SETL2: 397 - if (!card->flags & ACT2000_FLAGS_RUNNING) 397 + if (!(card->flags & ACT2000_FLAGS_RUNNING)) 398 398 return -ENODEV; 399 399 if (!(chan = find_channel(card, c->arg & 0x0f))) 400 400 break; 401 401 chan->l2prot = (c->arg >> 8); 402 402 return 0; 403 403 case ISDN_CMD_SETL3: 404 - if (!card->flags & ACT2000_FLAGS_RUNNING) 404 + if (!(card->flags & ACT2000_FLAGS_RUNNING)) 405 405 return -ENODEV; 406 406 if ((c->arg >> 8) != ISDN_PROTO_L3_TRANS) { 407 407 printk(KERN_WARNING "L3 protocol unknown\n"); ··· 524 524 act2000_card *card = act2000_findcard(id); 525 525 526 526 if (card) { 527 - if (!card->flags & ACT2000_FLAGS_RUNNING) 527 + if (!(card->flags & ACT2000_FLAGS_RUNNING)) 528 528 return -ENODEV; 529 529 return (len); 530 530 } ··· 539 539 act2000_card *card = act2000_findcard(id); 540 540 541 541 if (card) { 542 - if (!card->flags & ACT2000_FLAGS_RUNNING) 542 + if (!(card->flags & ACT2000_FLAGS_RUNNING)) 543 543 return -ENODEV; 544 544 return (act2000_readstatus(buf, len, card)); 545 545 } ··· 554 554 act2000_card *card = act2000_findcard(id); 555 555 556 556 if (card) { 557 - if (!card->flags & ACT2000_FLAGS_RUNNING) 557 + if (!(card->flags & ACT2000_FLAGS_RUNNING)) 558 558 return -ENODEV; 559 559 return (act2000_sendbuf(card, channel, ack, skb)); 560 560 }
+1 -1
drivers/isdn/i4l/isdn_ttyfax.c
··· 834 834 char *rp = &f->resolution; 835 835 836 836 p[0] += 2; 837 - if (!info->faxonline & 1) /* not outgoing connection */ 837 + if (!(info->faxonline & 1)) /* not outgoing connection */ 838 838 PARSE_ERROR1; 839 839 840 840 for (i = 0; (((*p[0] >= '0') && (*p[0] <= '9')) || (*p[0] == ',')) && (i < 4); i++) {
+11 -11
drivers/isdn/icn/icn.c
··· 1302 1302 } 1303 1303 break; 1304 1304 case ISDN_CMD_DIAL: 1305 - if (!card->flags & ICN_FLAGS_RUNNING) 1305 + if (!(card->flags & ICN_FLAGS_RUNNING)) 1306 1306 return -ENODEV; 1307 1307 if (card->leased) 1308 1308 break; ··· 1328 1328 } 1329 1329 break; 1330 1330 case ISDN_CMD_ACCEPTD: 1331 - if (!card->flags & ICN_FLAGS_RUNNING) 1331 + if (!(card->flags & ICN_FLAGS_RUNNING)) 1332 1332 return -ENODEV; 1333 1333 if (c->arg < ICN_BCH) { 1334 1334 a = c->arg + 1; ··· 1348 1348 } 1349 1349 break; 1350 1350 case ISDN_CMD_ACCEPTB: 1351 - if (!card->flags & ICN_FLAGS_RUNNING) 1351 + if (!(card->flags & ICN_FLAGS_RUNNING)) 1352 1352 return -ENODEV; 1353 1353 if (c->arg < ICN_BCH) { 1354 1354 a = c->arg + 1; ··· 1366 1366 } 1367 1367 break; 1368 1368 case ISDN_CMD_HANGUP: 1369 - if (!card->flags & ICN_FLAGS_RUNNING) 1369 + if (!(card->flags & ICN_FLAGS_RUNNING)) 1370 1370 return -ENODEV; 1371 1371 if (c->arg < ICN_BCH) { 1372 1372 a = c->arg + 1; ··· 1375 1375 } 1376 1376 break; 1377 1377 case ISDN_CMD_SETEAZ: 1378 - if (!card->flags & ICN_FLAGS_RUNNING) 1378 + if (!(card->flags & ICN_FLAGS_RUNNING)) 1379 1379 return -ENODEV; 1380 1380 if (card->leased) 1381 1381 break; ··· 1391 1391 } 1392 1392 break; 1393 1393 case ISDN_CMD_CLREAZ: 1394 - if (!card->flags & ICN_FLAGS_RUNNING) 1394 + if (!(card->flags & ICN_FLAGS_RUNNING)) 1395 1395 return -ENODEV; 1396 1396 if (card->leased) 1397 1397 break; ··· 1405 1405 } 1406 1406 break; 1407 1407 case ISDN_CMD_SETL2: 1408 - if (!card->flags & ICN_FLAGS_RUNNING) 1408 + if (!(card->flags & ICN_FLAGS_RUNNING)) 1409 1409 return -ENODEV; 1410 1410 if ((c->arg & 255) < ICN_BCH) { 1411 1411 a = c->arg; ··· 1424 1424 } 1425 1425 break; 1426 1426 case ISDN_CMD_SETL3: 1427 - if (!card->flags & ICN_FLAGS_RUNNING) 1427 + if (!(card->flags & ICN_FLAGS_RUNNING)) 1428 1428 return -ENODEV; 1429 1429 return 0; 1430 1430 default: ··· 1471 1471 icn_card *card = icn_findcard(id); 1472 1472 1473 1473 if (card) { 1474 - if (!card->flags & ICN_FLAGS_RUNNING) 1474 + if (!(card->flags & ICN_FLAGS_RUNNING)) 1475 1475 return -ENODEV; 1476 1476 return (icn_writecmd(buf, len, 1, card)); 1477 1477 } ··· 1486 1486 icn_card *card = icn_findcard(id); 1487 1487 1488 1488 if (card) { 1489 - if (!card->flags & ICN_FLAGS_RUNNING) 1489 + if (!(card->flags & ICN_FLAGS_RUNNING)) 1490 1490 return -ENODEV; 1491 1491 return (icn_readstatus(buf, len, card)); 1492 1492 } ··· 1501 1501 icn_card *card = icn_findcard(id); 1502 1502 1503 1503 if (card) { 1504 - if (!card->flags & ICN_FLAGS_RUNNING) 1504 + if (!(card->flags & ICN_FLAGS_RUNNING)) 1505 1505 return -ENODEV; 1506 1506 return (icn_sendbuf(channel, ack, skb, card)); 1507 1507 }
+8 -8
drivers/isdn/isdnloop/isdnloop.c
··· 1184 1184 } 1185 1185 break; 1186 1186 case ISDN_CMD_DIAL: 1187 - if (!card->flags & ISDNLOOP_FLAGS_RUNNING) 1187 + if (!(card->flags & ISDNLOOP_FLAGS_RUNNING)) 1188 1188 return -ENODEV; 1189 1189 if (card->leased) 1190 1190 break; ··· 1210 1210 } 1211 1211 break; 1212 1212 case ISDN_CMD_ACCEPTD: 1213 - if (!card->flags & ISDNLOOP_FLAGS_RUNNING) 1213 + if (!(card->flags & ISDNLOOP_FLAGS_RUNNING)) 1214 1214 return -ENODEV; 1215 1215 if (c->arg < ISDNLOOP_BCH) { 1216 1216 a = c->arg + 1; ··· 1238 1238 } 1239 1239 break; 1240 1240 case ISDN_CMD_ACCEPTB: 1241 - if (!card->flags & ISDNLOOP_FLAGS_RUNNING) 1241 + if (!(card->flags & ISDNLOOP_FLAGS_RUNNING)) 1242 1242 return -ENODEV; 1243 1243 if (c->arg < ISDNLOOP_BCH) { 1244 1244 a = c->arg + 1; ··· 1264 1264 i = isdnloop_writecmd(cbuf, strlen(cbuf), 0, card); 1265 1265 break; 1266 1266 case ISDN_CMD_HANGUP: 1267 - if (!card->flags & ISDNLOOP_FLAGS_RUNNING) 1267 + if (!(card->flags & ISDNLOOP_FLAGS_RUNNING)) 1268 1268 return -ENODEV; 1269 1269 if (c->arg < ISDNLOOP_BCH) { 1270 1270 a = c->arg + 1; ··· 1273 1273 } 1274 1274 break; 1275 1275 case ISDN_CMD_SETEAZ: 1276 - if (!card->flags & ISDNLOOP_FLAGS_RUNNING) 1276 + if (!(card->flags & ISDNLOOP_FLAGS_RUNNING)) 1277 1277 return -ENODEV; 1278 1278 if (card->leased) 1279 1279 break; ··· 1303 1303 } 1304 1304 break; 1305 1305 case ISDN_CMD_SETL2: 1306 - if (!card->flags & ISDNLOOP_FLAGS_RUNNING) 1306 + if (!(card->flags & ISDNLOOP_FLAGS_RUNNING)) 1307 1307 return -ENODEV; 1308 1308 if ((c->arg & 255) < ISDNLOOP_BCH) { 1309 1309 a = c->arg; ··· 1395 1395 isdnloop_card *card = isdnloop_findcard(id); 1396 1396 1397 1397 if (card) { 1398 - if (!card->flags & ISDNLOOP_FLAGS_RUNNING) 1398 + if (!(card->flags & ISDNLOOP_FLAGS_RUNNING)) 1399 1399 return -ENODEV; 1400 1400 return (isdnloop_readstatus(buf, len, card)); 1401 1401 } ··· 1410 1410 isdnloop_card *card = isdnloop_findcard(id); 1411 1411 1412 1412 if (card) { 1413 - if (!card->flags & ISDNLOOP_FLAGS_RUNNING) 1413 + if (!(card->flags & ISDNLOOP_FLAGS_RUNNING)) 1414 1414 return -ENODEV; 1415 1415 /* ack request stored in skb scratch area */ 1416 1416 *(skb->head) = ack;
+1 -1
drivers/video/i810/i810_main.c
··· 1476 1476 struct i810fb_par *par = info->par; 1477 1477 u8 __iomem *mmio = par->mmio_start_virtual; 1478 1478 1479 - if (!par->dev_flags & LOCKUP) 1479 + if (!(par->dev_flags & LOCKUP)) 1480 1480 return -ENXIO; 1481 1481 1482 1482 if (cursor->image.width > 64 || cursor->image.height > 64)
+1 -1
drivers/video/sis/sis_main.c
··· 427 427 428 428 monitor->feature = buffer[0x18]; 429 429 430 - if(!buffer[0x14] & 0x80) { 430 + if(!(buffer[0x14] & 0x80)) { 431 431 if(!(buffer[0x14] & 0x08)) { 432 432 printk(KERN_INFO 433 433 "sisfb: WARNING: Monitor does not support separate syncs\n");