Commit d71277dc authored by Desmond Yan's avatar Desmond Yan Committed by Greg Kroah-Hartman
Browse files

misc: bcm-vk: fix set_q_num API precedence issue 



Change set_q_num API to use if-else to make it more explicit,
and avoid a precedence rule issue.

Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarDesmond Yan <desmond.yan@broadcom.com>
Signed-off-by: default avatarScott Branden <scott.branden@broadcom.com>
Link: https://lore.kernel.org/r/20210129060403.14801-1-scott.branden@broadcom.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e4612ecd

drivers/misc/bcm-vk/bcm_vk_msg.c

+8 −2
Original line number Diff line number Diff line
@@ -52,8 +52,14 @@ static u32 get_q_num(const struct vk_msg_blk *msg) 


static void set_q_num(struct vk_msg_blk *msg, u32 q_num)

{

	msg->trans_id = (msg->trans_id & ~BCM_VK_MSG_Q_MASK) |

		(q_num >= VK_MSGQ_PER_CHAN_MAX) ? VK_MSGQ_NUM_DEFAULT : q_num;

	u32 trans_q;



	if (q_num >= VK_MSGQ_PER_CHAN_MAX)

		trans_q = VK_MSGQ_NUM_DEFAULT;

	else

		trans_q = q_num;



	msg->trans_id = (msg->trans_id & ~BCM_VK_MSG_Q_MASK) | trans_q;

}



static u32 get_msg_id(const struct vk_msg_blk *msg)