Commit 5355d8ca authored by Roel Kluin's avatar Roel Kluin Committed by Greg Kroah-Hartman
Browse files

Staging: fix operator precedence errors



`!' has a higher precedence than `&' and `|' has a higher precedence than `?'

Signed-off-by: default avatarRoel Kluin <roel.kluin@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f71fb77c
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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)
		err++;

	if (!cmd->convert_src & (TRIG_EXT | TRIG_TIMER))
	if (!(cmd->convert_src & (TRIG_EXT | TRIG_TIMER)))
		err++;

	tmp = cmd->scan_end_src;
+2 −1
Original line number Diff line number Diff line
@@ -101,7 +101,8 @@ static int netfs_trans_send_pages(struct netfs_trans *t, struct netfs_state *st)
			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);
		if (err <= 0) {
+1 −1
Original line number Diff line number Diff line
@@ -1776,7 +1776,7 @@ int rt_ioctl_siwencode(struct net_device *dev,
            }
        else
			/* Don't complain if only change the mode */
			if(!erq->flags & IW_ENCODE_MODE) {
			if(!(erq->flags & IW_ENCODE_MODE)) {
				return -EINVAL;
		}
	}
+1 −1
Original line number Diff line number Diff line
@@ -1776,7 +1776,7 @@ int rt_ioctl_siwencode(struct net_device *dev,
            }
        else
			/* Don't complain if only change the mode */
			if(!erq->flags & IW_ENCODE_MODE) {
			if(!(erq->flags & IW_ENCODE_MODE)) {
				return -EINVAL;
		}
	}
+1 −3
Original line number Diff line number Diff line
@@ -1725,11 +1725,9 @@ int rt_ioctl_siwencode(struct net_device *dev,
            }
        else
			/* Don't complain if only change the mode */
		if(!erq->flags & IW_ENCODE_MODE)
		{
		if (!(erq->flags & IW_ENCODE_MODE))
				return -EINVAL;
	}
	}

done:
    DBGPRINT(RT_DEBUG_TRACE ,("==>rt_ioctl_siwencode::erq->flags=%x\n",erq->flags));