Skip to content

L
linux
Commit eaa0ff15 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Linus Torvalds
Browse files
Options

fix ! versus & precedence in various places 

Fix various instances of

	if (!expr & mask)

which should probably have been

	if (!(expr & mask))
Signed-off-by: default avatarAlexey 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 551e4fb2
Show whitespace changes
Inline Side-by-side
Showing with 36 additions and 36 deletions
drivers/block/paride/pt.c
View file @ eaa0ff15
...@@ -660,7 +660,7 @@ static int pt_open(struct inode *inode, struct file *file) ...@@ -660,7 +660,7 @@ static int pt_open(struct inode *inode, struct file *file)
pt_identify(tape); pt_identify(tape);
err = -ENODEV; err = -ENODEV;
if (!tape->flags & PT_MEDIA) if (!(tape->flags & PT_MEDIA))
goto out; goto out;
err = -EROFS; err = -EROFS;
......
drivers/block/pktcdvd.c
View file @ eaa0ff15
...@@ -2212,11 +2212,11 @@ static int pkt_media_speed(struct pktcdvd_device *pd, unsigned *speed) ...@@ -2212,11 +2212,11 @@ static int pkt_media_speed(struct pktcdvd_device *pd, unsigned *speed)
return ret; return ret;
} }
if (!buf[6] & 0x40) { if (!(buf[6] & 0x40)) {
printk(DRIVER_NAME": Disc type is not CD-RW\n"); printk(DRIVER_NAME": Disc type is not CD-RW\n");
return 1; return 1;
} }
if (!buf[6] & 0x4) { if (!(buf[6] & 0x4)) {
printk(DRIVER_NAME": A1 values on media are not valid, maybe not CDRW?\n"); printk(DRIVER_NAME": A1 values on media are not valid, maybe not CDRW?\n");
return 1; return 1;
} }
......
drivers/isdn/act2000/module.c
View file @ eaa0ff15
...@@ -310,7 +310,7 @@ act2000_command(act2000_card * card, isdn_ctrl * c) ...@@ -310,7 +310,7 @@ act2000_command(act2000_card * card, isdn_ctrl * c)
} }
break; break;
case ISDN_CMD_DIAL: case ISDN_CMD_DIAL:
if (!card->flags & ACT2000_FLAGS_RUNNING) if (!(card->flags & ACT2000_FLAGS_RUNNING))
return -ENODEV; return -ENODEV;
if (!(chan = find_channel(card, c->arg & 0x0f))) if (!(chan = find_channel(card, c->arg & 0x0f)))
break; break;
...@@ -339,7 +339,7 @@ act2000_command(act2000_card * card, isdn_ctrl * c) ...@@ -339,7 +339,7 @@ act2000_command(act2000_card * card, isdn_ctrl * c)
} }
return ret; return ret;
case ISDN_CMD_ACCEPTD: case ISDN_CMD_ACCEPTD:
if (!card->flags & ACT2000_FLAGS_RUNNING) if (!(card->flags & ACT2000_FLAGS_RUNNING))
return -ENODEV; return -ENODEV;
if (!(chan = find_channel(card, c->arg & 0x0f))) if (!(chan = find_channel(card, c->arg & 0x0f)))
break; break;
...@@ -347,11 +347,11 @@ act2000_command(act2000_card * card, isdn_ctrl * c) ...@@ -347,11 +347,11 @@ act2000_command(act2000_card * card, isdn_ctrl * c)
actcapi_select_b2_protocol_req(card, chan); actcapi_select_b2_protocol_req(card, chan);
return 0; return 0;
case ISDN_CMD_ACCEPTB: case ISDN_CMD_ACCEPTB:
if (!card->flags & ACT2000_FLAGS_RUNNING) if (!(card->flags & ACT2000_FLAGS_RUNNING))
return -ENODEV; return -ENODEV;
return 0; return 0;
case ISDN_CMD_HANGUP: case ISDN_CMD_HANGUP:
if (!card->flags & ACT2000_FLAGS_RUNNING) if (!(card->flags & ACT2000_FLAGS_RUNNING))
return -ENODEV; return -ENODEV;
if (!(chan = find_channel(card, c->arg & 0x0f))) if (!(chan = find_channel(card, c->arg & 0x0f)))
break; break;
...@@ -366,7 +366,7 @@ act2000_command(act2000_card * card, isdn_ctrl * c) ...@@ -366,7 +366,7 @@ act2000_command(act2000_card * card, isdn_ctrl * c)
} }
return 0; return 0;
case ISDN_CMD_SETEAZ: case ISDN_CMD_SETEAZ:
if (!card->flags & ACT2000_FLAGS_RUNNING) if (!(card->flags & ACT2000_FLAGS_RUNNING))
return -ENODEV; return -ENODEV;
if (!(chan = find_channel(card, c->arg & 0x0f))) if (!(chan = find_channel(card, c->arg & 0x0f)))
break; break;
...@@ -386,7 +386,7 @@ act2000_command(act2000_card * card, isdn_ctrl * c) ...@@ -386,7 +386,7 @@ act2000_command(act2000_card * card, isdn_ctrl * c)
actcapi_listen_req(card); actcapi_listen_req(card);
return 0; return 0;
case ISDN_CMD_CLREAZ: case ISDN_CMD_CLREAZ:
if (!card->flags & ACT2000_FLAGS_RUNNING) if (!(card->flags & ACT2000_FLAGS_RUNNING))
return -ENODEV; return -ENODEV;
if (!(chan = find_channel(card, c->arg & 0x0f))) if (!(chan = find_channel(card, c->arg & 0x0f)))
break; break;
...@@ -394,14 +394,14 @@ act2000_command(act2000_card * card, isdn_ctrl * c) ...@@ -394,14 +394,14 @@ act2000_command(act2000_card * card, isdn_ctrl * c)
actcapi_listen_req(card); actcapi_listen_req(card);
return 0; return 0;
case ISDN_CMD_SETL2: case ISDN_CMD_SETL2:
if (!card->flags & ACT2000_FLAGS_RUNNING) if (!(card->flags & ACT2000_FLAGS_RUNNING))
return -ENODEV; return -ENODEV;
if (!(chan = find_channel(card, c->arg & 0x0f))) if (!(chan = find_channel(card, c->arg & 0x0f)))
break; break;
chan->l2prot = (c->arg >> 8); chan->l2prot = (c->arg >> 8);
return 0; return 0;
case ISDN_CMD_SETL3: case ISDN_CMD_SETL3:
if (!card->flags & ACT2000_FLAGS_RUNNING) if (!(card->flags & ACT2000_FLAGS_RUNNING))
return -ENODEV; return -ENODEV;
if ((c->arg >> 8) != ISDN_PROTO_L3_TRANS) { if ((c->arg >> 8) != ISDN_PROTO_L3_TRANS) {
printk(KERN_WARNING "L3 protocol unknown\n"); 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,7 +524,7 @@ if_writecmd(const u_char __user *buf, int len, int id, int channel)
act2000_card *card = act2000_findcard(id); act2000_card *card = act2000_findcard(id);
if (card) { if (card) {
if (!card->flags & ACT2000_FLAGS_RUNNING) if (!(card->flags & ACT2000_FLAGS_RUNNING))
return -ENODEV; return -ENODEV;
return (len); return (len);
} }
...@@ -539,7 +539,7 @@ if_readstatus(u_char __user * buf, int len, int id, int channel) ...@@ -539,7 +539,7 @@ if_readstatus(u_char __user * buf, int len, int id, int channel)
act2000_card *card = act2000_findcard(id); act2000_card *card = act2000_findcard(id);
if (card) { if (card) {
if (!card->flags & ACT2000_FLAGS_RUNNING) if (!(card->flags & ACT2000_FLAGS_RUNNING))
return -ENODEV; return -ENODEV;
return (act2000_readstatus(buf, len, card)); return (act2000_readstatus(buf, len, card));
} }
...@@ -554,7 +554,7 @@ if_sendbuf(int id, int channel, int ack, struct sk_buff *skb) ...@@ -554,7 +554,7 @@ if_sendbuf(int id, int channel, int ack, struct sk_buff *skb)
act2000_card *card = act2000_findcard(id); act2000_card *card = act2000_findcard(id);
if (card) { if (card) {
if (!card->flags & ACT2000_FLAGS_RUNNING) if (!(card->flags & ACT2000_FLAGS_RUNNING))
return -ENODEV; return -ENODEV;
return (act2000_sendbuf(card, channel, ack, skb)); return (act2000_sendbuf(card, channel, ack, skb));
} }
......
drivers/isdn/i4l/isdn_ttyfax.c
View file @ eaa0ff15
...@@ -834,7 +834,7 @@ isdn_tty_cmd_FCLASS2(char **p, modem_info * info) ...@@ -834,7 +834,7 @@ isdn_tty_cmd_FCLASS2(char **p, modem_info * info)
char *rp = &f->resolution; char *rp = &f->resolution;
p[0] += 2; p[0] += 2;
if (!info->faxonline & 1) /* not outgoing connection */ if (!(info->faxonline & 1)) /* not outgoing connection */
PARSE_ERROR1; PARSE_ERROR1;
for (i = 0; (((*p[0] >= '0') && (*p[0] <= '9')) || (*p[0] == ',')) && (i < 4); i++) { for (i = 0; (((*p[0] >= '0') && (*p[0] <= '9')) || (*p[0] == ',')) && (i < 4); i++) {
......
drivers/isdn/icn/icn.c
View file @ eaa0ff15
...@@ -1302,7 +1302,7 @@ icn_command(isdn_ctrl * c, icn_card * card) ...@@ -1302,7 +1302,7 @@ icn_command(isdn_ctrl * c, icn_card * card)
} }
break; break;
case ISDN_CMD_DIAL: case ISDN_CMD_DIAL:
if (!card->flags & ICN_FLAGS_RUNNING) if (!(card->flags & ICN_FLAGS_RUNNING))
return -ENODEV; return -ENODEV;
if (card->leased) if (card->leased)
break; break;
...@@ -1328,7 +1328,7 @@ icn_command(isdn_ctrl * c, icn_card * card) ...@@ -1328,7 +1328,7 @@ icn_command(isdn_ctrl * c, icn_card * card)
} }
break; break;
case ISDN_CMD_ACCEPTD: case ISDN_CMD_ACCEPTD:
if (!card->flags & ICN_FLAGS_RUNNING) if (!(card->flags & ICN_FLAGS_RUNNING))
return -ENODEV; return -ENODEV;
if (c->arg < ICN_BCH) { if (c->arg < ICN_BCH) {
a = c->arg + 1; a = c->arg + 1;
...@@ -1348,7 +1348,7 @@ icn_command(isdn_ctrl * c, icn_card * card) ...@@ -1348,7 +1348,7 @@ icn_command(isdn_ctrl * c, icn_card * card)
} }
break; break;
case ISDN_CMD_ACCEPTB: case ISDN_CMD_ACCEPTB:
if (!card->flags & ICN_FLAGS_RUNNING) if (!(card->flags & ICN_FLAGS_RUNNING))
return -ENODEV; return -ENODEV;
if (c->arg < ICN_BCH) { if (c->arg < ICN_BCH) {
a = c->arg + 1; a = c->arg + 1;
...@@ -1366,7 +1366,7 @@ icn_command(isdn_ctrl * c, icn_card * card) ...@@ -1366,7 +1366,7 @@ icn_command(isdn_ctrl * c, icn_card * card)
} }
break; break;
case ISDN_CMD_HANGUP: case ISDN_CMD_HANGUP:
if (!card->flags & ICN_FLAGS_RUNNING) if (!(card->flags & ICN_FLAGS_RUNNING))
return -ENODEV; return -ENODEV;
if (c->arg < ICN_BCH) { if (c->arg < ICN_BCH) {
a = c->arg + 1; a = c->arg + 1;
...@@ -1375,7 +1375,7 @@ icn_command(isdn_ctrl * c, icn_card * card) ...@@ -1375,7 +1375,7 @@ icn_command(isdn_ctrl * c, icn_card * card)
} }
break; break;
case ISDN_CMD_SETEAZ: case ISDN_CMD_SETEAZ:
if (!card->flags & ICN_FLAGS_RUNNING) if (!(card->flags & ICN_FLAGS_RUNNING))
return -ENODEV; return -ENODEV;
if (card->leased) if (card->leased)
break; break;
...@@ -1391,7 +1391,7 @@ icn_command(isdn_ctrl * c, icn_card * card) ...@@ -1391,7 +1391,7 @@ icn_command(isdn_ctrl * c, icn_card * card)
} }
break; break;
case ISDN_CMD_CLREAZ: case ISDN_CMD_CLREAZ:
if (!card->flags & ICN_FLAGS_RUNNING) if (!(card->flags & ICN_FLAGS_RUNNING))
return -ENODEV; return -ENODEV;
if (card->leased) if (card->leased)
break; break;
...@@ -1405,7 +1405,7 @@ icn_command(isdn_ctrl * c, icn_card * card) ...@@ -1405,7 +1405,7 @@ icn_command(isdn_ctrl * c, icn_card * card)
} }
break; break;
case ISDN_CMD_SETL2: case ISDN_CMD_SETL2:
if (!card->flags & ICN_FLAGS_RUNNING) if (!(card->flags & ICN_FLAGS_RUNNING))
return -ENODEV; return -ENODEV;
if ((c->arg & 255) < ICN_BCH) { if ((c->arg & 255) < ICN_BCH) {
a = c->arg; a = c->arg;
...@@ -1424,7 +1424,7 @@ icn_command(isdn_ctrl * c, icn_card * card) ...@@ -1424,7 +1424,7 @@ icn_command(isdn_ctrl * c, icn_card * card)
} }
break; break;
case ISDN_CMD_SETL3: case ISDN_CMD_SETL3:
if (!card->flags & ICN_FLAGS_RUNNING) if (!(card->flags & ICN_FLAGS_RUNNING))
return -ENODEV; return -ENODEV;
return 0; return 0;
default: default:
...@@ -1471,7 +1471,7 @@ if_writecmd(const u_char __user *buf, int len, int id, int channel) ...@@ -1471,7 +1471,7 @@ if_writecmd(const u_char __user *buf, int len, int id, int channel)
icn_card *card = icn_findcard(id); icn_card *card = icn_findcard(id);
if (card) { if (card) {
if (!card->flags & ICN_FLAGS_RUNNING) if (!(card->flags & ICN_FLAGS_RUNNING))
return -ENODEV; return -ENODEV;
return (icn_writecmd(buf, len, 1, card)); return (icn_writecmd(buf, len, 1, card));
} }
...@@ -1486,7 +1486,7 @@ if_readstatus(u_char __user *buf, int len, int id, int channel) ...@@ -1486,7 +1486,7 @@ if_readstatus(u_char __user *buf, int len, int id, int channel)
icn_card *card = icn_findcard(id); icn_card *card = icn_findcard(id);
if (card) { if (card) {
if (!card->flags & ICN_FLAGS_RUNNING) if (!(card->flags & ICN_FLAGS_RUNNING))
return -ENODEV; return -ENODEV;
return (icn_readstatus(buf, len, card)); return (icn_readstatus(buf, len, card));
} }
...@@ -1501,7 +1501,7 @@ if_sendbuf(int id, int channel, int ack, struct sk_buff *skb) ...@@ -1501,7 +1501,7 @@ if_sendbuf(int id, int channel, int ack, struct sk_buff *skb)
icn_card *card = icn_findcard(id); icn_card *card = icn_findcard(id);
if (card) { if (card) {
if (!card->flags & ICN_FLAGS_RUNNING) if (!(card->flags & ICN_FLAGS_RUNNING))
return -ENODEV; return -ENODEV;
return (icn_sendbuf(channel, ack, skb, card)); return (icn_sendbuf(channel, ack, skb, card));
} }
......
drivers/isdn/isdnloop/isdnloop.c
View file @ eaa0ff15
...@@ -1184,7 +1184,7 @@ isdnloop_command(isdn_ctrl * c, isdnloop_card * card) ...@@ -1184,7 +1184,7 @@ isdnloop_command(isdn_ctrl * c, isdnloop_card * card)
} }
break; break;
case ISDN_CMD_DIAL: case ISDN_CMD_DIAL:
if (!card->flags & ISDNLOOP_FLAGS_RUNNING) if (!(card->flags & ISDNLOOP_FLAGS_RUNNING))
return -ENODEV; return -ENODEV;
if (card->leased) if (card->leased)
break; break;
...@@ -1210,7 +1210,7 @@ isdnloop_command(isdn_ctrl * c, isdnloop_card * card) ...@@ -1210,7 +1210,7 @@ isdnloop_command(isdn_ctrl * c, isdnloop_card * card)
} }
break; break;
case ISDN_CMD_ACCEPTD: case ISDN_CMD_ACCEPTD:
if (!card->flags & ISDNLOOP_FLAGS_RUNNING) if (!(card->flags & ISDNLOOP_FLAGS_RUNNING))
return -ENODEV; return -ENODEV;
if (c->arg < ISDNLOOP_BCH) { if (c->arg < ISDNLOOP_BCH) {
a = c->arg + 1; a = c->arg + 1;
...@@ -1238,7 +1238,7 @@ isdnloop_command(isdn_ctrl * c, isdnloop_card * card) ...@@ -1238,7 +1238,7 @@ isdnloop_command(isdn_ctrl * c, isdnloop_card * card)
} }
break; break;
case ISDN_CMD_ACCEPTB: case ISDN_CMD_ACCEPTB:
if (!card->flags & ISDNLOOP_FLAGS_RUNNING) if (!(card->flags & ISDNLOOP_FLAGS_RUNNING))
return -ENODEV; return -ENODEV;
if (c->arg < ISDNLOOP_BCH) { if (c->arg < ISDNLOOP_BCH) {
a = c->arg + 1; a = c->arg + 1;
...@@ -1264,7 +1264,7 @@ isdnloop_command(isdn_ctrl * c, isdnloop_card * card) ...@@ -1264,7 +1264,7 @@ isdnloop_command(isdn_ctrl * c, isdnloop_card * card)
i = isdnloop_writecmd(cbuf, strlen(cbuf), 0, card); i = isdnloop_writecmd(cbuf, strlen(cbuf), 0, card);
break; break;
case ISDN_CMD_HANGUP: case ISDN_CMD_HANGUP:
if (!card->flags & ISDNLOOP_FLAGS_RUNNING) if (!(card->flags & ISDNLOOP_FLAGS_RUNNING))
return -ENODEV; return -ENODEV;
if (c->arg < ISDNLOOP_BCH) { if (c->arg < ISDNLOOP_BCH) {
a = c->arg + 1; a = c->arg + 1;
...@@ -1273,7 +1273,7 @@ isdnloop_command(isdn_ctrl * c, isdnloop_card * card) ...@@ -1273,7 +1273,7 @@ isdnloop_command(isdn_ctrl * c, isdnloop_card * card)
} }
break; break;
case ISDN_CMD_SETEAZ: case ISDN_CMD_SETEAZ:
if (!card->flags & ISDNLOOP_FLAGS_RUNNING) if (!(card->flags & ISDNLOOP_FLAGS_RUNNING))
return -ENODEV; return -ENODEV;
if (card->leased) if (card->leased)
break; break;
...@@ -1303,7 +1303,7 @@ isdnloop_command(isdn_ctrl * c, isdnloop_card * card) ...@@ -1303,7 +1303,7 @@ isdnloop_command(isdn_ctrl * c, isdnloop_card * card)
} }
break; break;
case ISDN_CMD_SETL2: case ISDN_CMD_SETL2:
if (!card->flags & ISDNLOOP_FLAGS_RUNNING) if (!(card->flags & ISDNLOOP_FLAGS_RUNNING))
return -ENODEV; return -ENODEV;
if ((c->arg & 255) < ISDNLOOP_BCH) { if ((c->arg & 255) < ISDNLOOP_BCH) {
a = c->arg; a = c->arg;
...@@ -1395,7 +1395,7 @@ if_readstatus(u_char __user *buf, int len, int id, int channel) ...@@ -1395,7 +1395,7 @@ if_readstatus(u_char __user *buf, int len, int id, int channel)
isdnloop_card *card = isdnloop_findcard(id); isdnloop_card *card = isdnloop_findcard(id);
if (card) { if (card) {
if (!card->flags & ISDNLOOP_FLAGS_RUNNING) if (!(card->flags & ISDNLOOP_FLAGS_RUNNING))
return -ENODEV; return -ENODEV;
return (isdnloop_readstatus(buf, len, card)); return (isdnloop_readstatus(buf, len, card));
} }
...@@ -1410,7 +1410,7 @@ if_sendbuf(int id, int channel, int ack, struct sk_buff *skb) ...@@ -1410,7 +1410,7 @@ if_sendbuf(int id, int channel, int ack, struct sk_buff *skb)
isdnloop_card *card = isdnloop_findcard(id); isdnloop_card *card = isdnloop_findcard(id);
if (card) { if (card) {
if (!card->flags & ISDNLOOP_FLAGS_RUNNING) if (!(card->flags & ISDNLOOP_FLAGS_RUNNING))
return -ENODEV; return -ENODEV;
/* ack request stored in skb scratch area */ /* ack request stored in skb scratch area */
*(skb->head) = ack; *(skb->head) = ack;
......
drivers/video/i810/i810_main.c
View file @ eaa0ff15
...@@ -1476,7 +1476,7 @@ static int i810fb_cursor(struct fb_info *info, struct fb_cursor *cursor) ...@@ -1476,7 +1476,7 @@ static int i810fb_cursor(struct fb_info *info, struct fb_cursor *cursor)
struct i810fb_par *par = info->par; struct i810fb_par *par = info->par;
u8 __iomem *mmio = par->mmio_start_virtual; u8 __iomem *mmio = par->mmio_start_virtual;
if (!par->dev_flags & LOCKUP) if (!(par->dev_flags & LOCKUP))
return -ENXIO; return -ENXIO;
if (cursor->image.width > 64 || cursor->image.height > 64) if (cursor->image.width > 64 || cursor->image.height > 64)
......
drivers/video/sis/sis_main.c
View file @ eaa0ff15
...@@ -427,7 +427,7 @@ sisfb_interpret_edid(struct sisfb_monitor *monitor, u8 *buffer) ...@@ -427,7 +427,7 @@ sisfb_interpret_edid(struct sisfb_monitor *monitor, u8 *buffer)
monitor->feature = buffer[0x18]; monitor->feature = buffer[0x18];
if(!buffer[0x14] & 0x80) { if(!(buffer[0x14] & 0x80)) {
if(!(buffer[0x14] & 0x08)) { if(!(buffer[0x14] & 0x08)) {
printk(KERN_INFO printk(KERN_INFO
"sisfb: WARNING: Monitor does not support separate syncs\n"); "sisfb: WARNING: Monitor does not support separate syncs\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7