]> rtime.felk.cvut.cz Git - linux-lin.git/commitdiff
sllin: Bugfix. Stop rx_timer when LIN response is received as CAN frame.
authorRostislav Lisovy <lisovy@gmail.com>
Fri, 16 Dec 2011 12:39:05 +0000 (13:39 +0100)
committerRostislav Lisovy <lisovy@gmail.com>
Fri, 16 Dec 2011 12:39:05 +0000 (13:39 +0100)
sllin/sllin.c

index 6a4e8bf0999bf516d3726ff3828b3c70f3417b0f..7388bb60b42cada46067d2f6ca37cb98fb117b0e 100644 (file)
@@ -879,6 +879,8 @@ int sllin_kwthread(void *ptr)
 
                                        lin_buff = (sl->lin_master) ? sl->tx_buff : sl->rx_buff;
                                        if (cf->can_id == (lin_buff[SLLIN_BUFF_ID] & LIN_ID_MASK)) {
+                                               hrtimer_cancel(&sl->rx_timer);
+                                               pr_debug("sllin: received LIN response in a CAN frame.\n");
                                                if (sllin_setup_msg(sl, SLLIN_STPMSG_RESPONLY,
                                                        cf->can_id & LIN_ID_MASK,
                                                        cf->data, cf->can_dlc) != -1) {