Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 86829
b: refs/heads/master
c: ae91d60
h: refs/heads/master
i:
  86827: a88f85c
v: v3
  • Loading branch information
Julia Lawall authored and Linus Torvalds committed Mar 5, 2008
1 parent 5c69ea4 commit 3d6b661
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 07fb6f26bab869fc3bb9df0a785ba734f4c51ac3
refs/heads/master: ae91d60ba88ef0bdb1b5e9b2363bd52fc45d2af7
3 changes: 2 additions & 1 deletion trunk/drivers/isdn/i4l/isdn_ttyfax.c
Original file line number Diff line number Diff line change
Expand Up @@ -906,7 +906,8 @@ isdn_tty_cmd_FCLASS2(char **p, modem_info * info)
sprintf(rs, "\r\n0-2");
isdn_tty_at_cout(rs, info);
} else {
if ((f->phase != ISDN_FAX_PHASE_D) || (!info->faxonline & 1))
if ((f->phase != ISDN_FAX_PHASE_D) ||
(!(info->faxonline & 1)))
PARSE_ERROR1;
par = isdn_getnum(p);
if ((par < 0) || (par > 2))
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/isdn/isdnloop/isdnloop.c
Original file line number Diff line number Diff line change
Expand Up @@ -1289,7 +1289,7 @@ isdnloop_command(isdn_ctrl * c, isdnloop_card * card)
}
break;
case ISDN_CMD_CLREAZ:
if (!card->flags & ISDNLOOP_FLAGS_RUNNING)
if (!(card->flags & ISDNLOOP_FLAGS_RUNNING))
return -ENODEV;
if (card->leased)
break;
Expand Down Expand Up @@ -1333,7 +1333,7 @@ isdnloop_command(isdn_ctrl * c, isdnloop_card * card)
}
break;
case ISDN_CMD_SETL3:
if (!card->flags & ISDNLOOP_FLAGS_RUNNING)
if (!(card->flags & ISDNLOOP_FLAGS_RUNNING))
return -ENODEV;
return 0;
default:
Expand Down Expand Up @@ -1380,7 +1380,7 @@ if_writecmd(const u_char __user *buf, int len, int id, int channel)
isdnloop_card *card = isdnloop_findcard(id);

if (card) {
if (!card->flags & ISDNLOOP_FLAGS_RUNNING)
if (!(card->flags & ISDNLOOP_FLAGS_RUNNING))
return -ENODEV;
return (isdnloop_writecmd(buf, len, 1, card));
}
Expand Down

0 comments on commit 3d6b661

Please sign in to comment.