Staging: fix operator precedence errors
`!' has a higher precedence than `&' and `|' has a higher precedence than `?' Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
f71fb77c29
commit
5355d8cac2
drivers/staging
|
@ -482,7 +482,7 @@ static int pcl816_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice
|
||||||
if (!cmd->scan_begin_src || tmp != cmd->scan_begin_src)
|
if (!cmd->scan_begin_src || tmp != cmd->scan_begin_src)
|
||||||
err++;
|
err++;
|
||||||
|
|
||||||
if (!cmd->convert_src & (TRIG_EXT | TRIG_TIMER))
|
if (!(cmd->convert_src & (TRIG_EXT | TRIG_TIMER)))
|
||||||
err++;
|
err++;
|
||||||
|
|
||||||
tmp = cmd->scan_end_src;
|
tmp = cmd->scan_end_src;
|
||||||
|
|
|
@ -101,7 +101,8 @@ static int netfs_trans_send_pages(struct netfs_trans *t, struct netfs_state *st)
|
||||||
goto err_out;
|
goto err_out;
|
||||||
}
|
}
|
||||||
|
|
||||||
msg.msg_flags = MSG_WAITALL|(attached_pages == 1)?0:MSG_MORE;
|
msg.msg_flags = MSG_WAITALL | (attached_pages == 1 ? 0 :
|
||||||
|
MSG_MORE);
|
||||||
|
|
||||||
err = kernel_sendpage(st->socket, page, 0, size, msg.msg_flags);
|
err = kernel_sendpage(st->socket, page, 0, size, msg.msg_flags);
|
||||||
if (err <= 0) {
|
if (err <= 0) {
|
||||||
|
|
|
@ -1776,7 +1776,7 @@ int rt_ioctl_siwencode(struct net_device *dev,
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
/* Don't complain if only change the mode */
|
/* Don't complain if only change the mode */
|
||||||
if(!erq->flags & IW_ENCODE_MODE) {
|
if(!(erq->flags & IW_ENCODE_MODE)) {
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1776,7 +1776,7 @@ int rt_ioctl_siwencode(struct net_device *dev,
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
/* Don't complain if only change the mode */
|
/* Don't complain if only change the mode */
|
||||||
if(!erq->flags & IW_ENCODE_MODE) {
|
if(!(erq->flags & IW_ENCODE_MODE)) {
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1725,10 +1725,8 @@ int rt_ioctl_siwencode(struct net_device *dev,
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
/* Don't complain if only change the mode */
|
/* Don't complain if only change the mode */
|
||||||
if(!erq->flags & IW_ENCODE_MODE)
|
if (!(erq->flags & IW_ENCODE_MODE))
|
||||||
{
|
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
done:
|
done:
|
||||||
|
|
Loading…
Reference in New Issue