Merge: Correction for 2.6.23-git kernel - unregister_chrdev() does not return value.

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

diff --git a/lincan/src/close.c b/lincan/src/close.c
index 73d4764d6662664bd06eec67255035b24875c0ea..e39b3b1a176d53e6fb4648907d414ef2c71e8ffc 100644 (file)
--- a/lincan/src/close.c
+++ b/lincan/src/close.c
@@ -4,14 +4,13 @@
  * Rewritten for new CAN queues by Pavel Pisa - OCERA team member
  * email:pisa@cmp.felk.cvut.cz
  * This software is released under the GPL-License.
- * Version lincan-0.2  9 Jul 2003
+ * Version lincan-0.3  17 Jun 2004
  */
 
 #include "../include/can.h"
 #include "../include/can_sysdep.h"
 #include "../include/main.h"
 #include "../include/close.h"
-#include "../include/i82527.h"
 #include "../include/setup.h"
 #include "../include/fasync.h"
 
@@ -23,6 +22,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 +31,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)){
                can_msgobj_clear_fl(obj,OPENED);
-               /* FIXME: what about clearing chip HW status, stopping sending messages etc? */
        };
+       can_spin_unlock_irqrestore(&canuser_manipulation_lock, iflags);
        
     #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,50))
        MOD_DEC_USE_COUNT;