Re: [PATCH 3/4] fix not-and/or errors
commit 568f9787e58b4d24be50ab2abf1c7dab12a9ef2c Author: Roel Kluin <[EMAIL PROTECTED]> Date: Wed Oct 17 15:16:44 2007 +0200 if(!x & y) should either be if(!(x & y)) or if(!x && y) I made changes as seemed appropriate, but please review several changes to drivers/isdn/ Signed-off-by: Roel Kluin <[EMAIL PROTECTED]> --- diff --git a/drivers/isdn/act2000/module.c b/drivers/isdn/act2000/module.c index ee2b0b9..8325022 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) } 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 =
Re: [PATCH 3/4] fix not-and/or errors
commit 568f9787e58b4d24be50ab2abf1c7dab12a9ef2c Author: Roel Kluin [EMAIL PROTECTED] Date: Wed Oct 17 15:16:44 2007 +0200 if(!x y) should either be if(!(x y)) or if(!x y) I made changes as seemed appropriate, but please review several changes to drivers/isdn/ Signed-off-by: Roel Kluin [EMAIL PROTECTED] --- diff --git a/drivers/isdn/act2000/module.c b/drivers/isdn/act2000/module.c index ee2b0b9..8325022 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) } 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) { -