Structured comments updated.

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

diff --git a/lincan/src/close.c b/lincan/src/close.c
index 4df1533e9fa283dba8228f71a35c4a4d47c2eea3..9042ff2a2ec0d4e188dd2a12cad32315e8c458cf 100644 (file)
--- a/lincan/src/close.c
+++ b/lincan/src/close.c
@@ -23,6 +23,7 @@ int can_close(struct inode *inode, struct file *file)
        struct canuser_t *canuser = (struct canuser_t*)(file->private_data);
        struct canque_ends_t *qends;
        struct msgobj_t *obj;
+       can_spin_irqflags_t iflags;
        
        if(!canuser || (canuser->magic != CAN_USER_MAGIC)){
                CANMSG("can_close: bad canuser magic\n");
@@ -31,23 +32,26 @@ int can_close(struct inode *inode, struct file *file)
        
        obj = canuser->msgobj;
        qends = canuser->qends;
-
+       
     #ifdef CAN_ENABLE_KERN_FASYNC
 
        can_fasync(-1, file, 0);
 
     #endif /*CAN_ENABLE_KERN_FASYNC*/
 
+       can_spin_lock_irqsave(&canuser_manipulation_lock, iflags);
        list_del(&canuser->peers);
+       can_spin_unlock_irqrestore(&canuser_manipulation_lock, iflags);
        canuser->qends = NULL;
        canqueue_ends_dispose_kern(qends, file->f_flags & O_SYNC);
 
        kfree(canuser);
 
+       can_spin_lock_irqsave(&canuser_manipulation_lock, iflags);
        if(atomic_dec_and_test(&obj->obj_used)){
-               obj->flags &= ~OBJ_OPENED;
-               /* FIXME: what about clearing chip HW status, stopping sending messages etc? */
+               can_msgobj_clear_fl(obj,OPENED);
        };
+       can_spin_unlock_irqrestore(&canuser_manipulation_lock, iflags);
        
     #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,50))
        MOD_DEC_USE_COUNT;