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>
This commit is contained in:
committed by
Linus Torvalds
parent
551e4fb246
commit
eaa0ff15c3
@@ -310,7 +310,7 @@ act2000_command(act2000_card * card, isdn_ctrl * c)
|
||||
}
|
||||
break;
|
||||
case ISDN_CMD_DIAL:
|
||||
if (!card->flags & ACT2000_FLAGS_RUNNING)
|
||||
if (!(card->flags & ACT2000_FLAGS_RUNNING))
|
||||
return -ENODEV;
|
||||
if (!(chan = find_channel(card, c->arg & 0x0f)))
|
||||
break;
|
||||
@@ -339,7 +339,7 @@ act2000_command(act2000_card * card, isdn_ctrl * c)
|
||||
}
|
||||
return ret;
|
||||
case ISDN_CMD_ACCEPTD:
|
||||
if (!card->flags & ACT2000_FLAGS_RUNNING)
|
||||
if (!(card->flags & ACT2000_FLAGS_RUNNING))
|
||||
return -ENODEV;
|
||||
if (!(chan = find_channel(card, c->arg & 0x0f)))
|
||||
break;
|
||||
@@ -347,11 +347,11 @@ act2000_command(act2000_card * card, isdn_ctrl * c)
|
||||
actcapi_select_b2_protocol_req(card, chan);
|
||||
return 0;
|
||||
case ISDN_CMD_ACCEPTB:
|
||||
if (!card->flags & ACT2000_FLAGS_RUNNING)
|
||||
if (!(card->flags & ACT2000_FLAGS_RUNNING))
|
||||
return -ENODEV;
|
||||
return 0;
|
||||
case ISDN_CMD_HANGUP:
|
||||
if (!card->flags & ACT2000_FLAGS_RUNNING)
|
||||
if (!(card->flags & ACT2000_FLAGS_RUNNING))
|
||||
return -ENODEV;
|
||||
if (!(chan = find_channel(card, c->arg & 0x0f)))
|
||||
break;
|
||||
@@ -366,7 +366,7 @@ act2000_command(act2000_card * card, isdn_ctrl * c)
|
||||
}
|
||||
return 0;
|
||||
case ISDN_CMD_SETEAZ:
|
||||
if (!card->flags & ACT2000_FLAGS_RUNNING)
|
||||
if (!(card->flags & ACT2000_FLAGS_RUNNING))
|
||||
return -ENODEV;
|
||||
if (!(chan = find_channel(card, c->arg & 0x0f)))
|
||||
break;
|
||||
@@ -386,7 +386,7 @@ act2000_command(act2000_card * card, isdn_ctrl * c)
|
||||
actcapi_listen_req(card);
|
||||
return 0;
|
||||
case ISDN_CMD_CLREAZ:
|
||||
if (!card->flags & ACT2000_FLAGS_RUNNING)
|
||||
if (!(card->flags & ACT2000_FLAGS_RUNNING))
|
||||
return -ENODEV;
|
||||
if (!(chan = find_channel(card, c->arg & 0x0f)))
|
||||
break;
|
||||
@@ -394,14 +394,14 @@ act2000_command(act2000_card * card, isdn_ctrl * c)
|
||||
actcapi_listen_req(card);
|
||||
return 0;
|
||||
case ISDN_CMD_SETL2:
|
||||
if (!card->flags & ACT2000_FLAGS_RUNNING)
|
||||
if (!(card->flags & ACT2000_FLAGS_RUNNING))
|
||||
return -ENODEV;
|
||||
if (!(chan = find_channel(card, c->arg & 0x0f)))
|
||||
break;
|
||||
chan->l2prot = (c->arg >> 8);
|
||||
return 0;
|
||||
case ISDN_CMD_SETL3:
|
||||
if (!card->flags & ACT2000_FLAGS_RUNNING)
|
||||
if (!(card->flags & ACT2000_FLAGS_RUNNING))
|
||||
return -ENODEV;
|
||||
if ((c->arg >> 8) != ISDN_PROTO_L3_TRANS) {
|
||||
printk(KERN_WARNING "L3 protocol unknown\n");
|
||||
@@ -524,7 +524,7 @@ if_writecmd(const u_char __user *buf, int len, int id, int channel)
|
||||
act2000_card *card = act2000_findcard(id);
|
||||
|
||||
if (card) {
|
||||
if (!card->flags & ACT2000_FLAGS_RUNNING)
|
||||
if (!(card->flags & ACT2000_FLAGS_RUNNING))
|
||||
return -ENODEV;
|
||||
return (len);
|
||||
}
|
||||
@@ -539,7 +539,7 @@ if_readstatus(u_char __user * buf, int len, int id, int channel)
|
||||
act2000_card *card = act2000_findcard(id);
|
||||
|
||||
if (card) {
|
||||
if (!card->flags & ACT2000_FLAGS_RUNNING)
|
||||
if (!(card->flags & ACT2000_FLAGS_RUNNING))
|
||||
return -ENODEV;
|
||||
return (act2000_readstatus(buf, len, card));
|
||||
}
|
||||
@@ -554,7 +554,7 @@ if_sendbuf(int id, int channel, int ack, struct sk_buff *skb)
|
||||
act2000_card *card = act2000_findcard(id);
|
||||
|
||||
if (card) {
|
||||
if (!card->flags & ACT2000_FLAGS_RUNNING)
|
||||
if (!(card->flags & ACT2000_FLAGS_RUNNING))
|
||||
return -ENODEV;
|
||||
return (act2000_sendbuf(card, channel, ack, skb));
|
||||
}
|
||||
|
Reference in New Issue
Block a user