LinCAN can be compiled in mode with RT-Linux chip worker threads now.

[lincan.git] / lincan / src / finish.c

diff --git a/lincan/src/finish.c b/lincan/src/finish.c
index a5cd8d176413cf85b38595d07211a7a66cdc06e1..922b4d3608077fe03dfda6a78142707b7e2566b7 100644 (file)
--- a/lincan/src/finish.c
+++ b/lincan/src/finish.c
@@ -9,8 +9,10 @@
 
 void msgobj_done(struct msgobj_t *obj)
 {
+       int delayed=0;
        if(obj->qends) {
-               if(canqueue_ends_done_chip(obj->qends) < 0)
+               delayed=canqueue_ends_done_chip(obj->qends);
+               if(delayed < 0)
                        CANMSG("msgobj_done: problem with chip queue ends\n");
        }
 
@@ -32,7 +34,11 @@ void msgobj_done(struct msgobj_t *obj)
        del_timer_sync(&obj->tx_timeout);
 
        if(obj->qends) {
-               can_checked_free(obj->qends);
+               /*delayed free could be required there in the future,
+                 actual use patter cannot generate such situation*/
+               if(!delayed) {
+                       can_checked_free(obj->qends);
+               }
        }
        obj->qends=NULL;
 }
@@ -51,10 +57,7 @@ void canchip_done(struct chip_t *chip)
                        CANMSG("canchip_done: not registered in hostdevice\n");
        }
 
-       if((chip->flags & CHIP_IRQ_SETUP) && (chip->chip_irq>=0)) {
-               free_irq(chip->chip_irq, chip);
-               chip->flags &= ~CHIP_IRQ_SETUP;
-       }
+       can_chip_free_irq(chip);
                
        can_synchronize_irq(chip->chip_irq);