drivers/isdn: correct use of ! and &
In commit e6bafba5b4
("wmi: (!x & y)
strikes again"), a bug was fixed that involved converting !x & y to !(x
& y). The code below shows the same pattern, and thus should perhaps be
fixed in the same way.
This is not tested and clearly changes the semantics, so it is only
something to consider.
The semantic patch that makes this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@@ expression E1,E2; @@
(
!E1 & !E2
|
- !E1 & E2
+ !(E1 & E2)
)
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
Cc: Karsten Keil <kkeil@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Родитель
07fb6f26ba
Коммит
ae91d60ba8
|
@ -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))
|
||||
|
|
|
@ -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;
|
||||
|
@ -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:
|
||||
|
@ -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));
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче