X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=module%2Felmcan.c;h=a75ddf1c3b4288d773333bf7f9828168f067bf1c;hb=521a2bdc04a021a0e58bd093097b751951caf408;hp=fd38475b0306b3538b8a14cbbb696b6127efa4a6;hpb=6cce55d96e2888876a17b841e21a7133c576d210;p=elmcan.git

diff --git a/module/elmcan.c b/module/elmcan.c
index fd38475..a75ddf1 100644
--- a/module/elmcan.c
+++ b/module/elmcan.c
@@ -209,8 +209,8 @@ static void elm327_send_frame(struct elmcan *elm, struct can_frame *frame)
 	/* Schedule any necessary changes in ELM327's CAN configuration */
 	if (elm->can_frame_to_send.can_id != frame->can_id) {
 		/* Set the new CAN ID for transmission. */
-		if ((frame->can_id & CAN_EFF_FLAG)
-		    ^ (elm->can_frame_to_send.can_id & CAN_EFF_FLAG)) {
+		if ((frame->can_id & CAN_EFF_FLAG) ^
+		    (elm->can_frame_to_send.can_id & CAN_EFF_FLAG)) {
 			elm->can_config = (frame->can_id & CAN_EFF_FLAG
 						? 0
 						: ELM327_CAN_CONFIG_SEND_SFF)
@@ -469,7 +469,6 @@ static int elm327_parse_frame(struct elmcan *elm, size_t len)
 		frame->can_id = CAN_EFF_FLAG;
 		datastart = 14;
 	} else if (elm->rxbuf[3] == ' ' && elm->rxbuf[5] == ' ') {
-		frame->can_id = 0;
 		datastart = 6;
 	} else {
 		/* This is not a well-formatted data line.