drivers/net: Move && and || to end of previous line

[mirror_ubuntu-zesty-kernel.git] / drivers / net / can / usb / ems_usb.c

diff --git a/drivers/net/can/usb/ems_usb.c b/drivers/net/can/usb/ems_usb.c
index 3e4419054c81efc0c593527d6069b5d6e699120d..591eb0eb1c2bdcc5ec147173a41829bd497c093b 100644 (file)
--- a/drivers/net/can/usb/ems_usb.c
+++ b/drivers/net/can/usb/ems_usb.c
@@ -318,12 +318,12 @@ static void ems_usb_rx_can_msg(struct ems_usb *dev, struct ems_cpc_msg *msg)
        cf->can_id = le32_to_cpu(msg->msg.can_msg.id);
        cf->can_dlc = min_t(u8, msg->msg.can_msg.length, 8);
 
-       if (msg->type == CPC_MSG_TYPE_EXT_CAN_FRAME
-           || msg->type == CPC_MSG_TYPE_EXT_RTR_FRAME)
+       if (msg->type == CPC_MSG_TYPE_EXT_CAN_FRAME ||
+           msg->type == CPC_MSG_TYPE_EXT_RTR_FRAME)
                cf->can_id |= CAN_EFF_FLAG;
 
-       if (msg->type == CPC_MSG_TYPE_RTR_FRAME
-           || msg->type == CPC_MSG_TYPE_EXT_RTR_FRAME) {
+       if (msg->type == CPC_MSG_TYPE_RTR_FRAME ||
+           msg->type == CPC_MSG_TYPE_EXT_RTR_FRAME) {
                cf->can_id |= CAN_RTR_FLAG;
        } else {
                for (i = 0; i < cf->can_dlc; i++)