X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/4dc78b4651f006bf0404c8ec7db85651bcee7c2e..04ac67cc3cac14cd601daacd0592121ec0b84012:/lincan/src/open.c diff --git a/lincan/src/open.c b/lincan/src/open.c index 535c2c3..f785e2c 100644 --- a/lincan/src/open.c +++ b/lincan/src/open.c @@ -51,7 +51,7 @@ int can_open(struct inode *inode, struct file *file) can_spin_irqflags_t iflags; char openflag; // Martin Petera: Object already opened - if ( ((obj=objects_p[MINOR_NR]) == NULL) || + if ( ((obj=objects_p[MINOR_NR]) == NULL) || ((chip=objects_p[MINOR_NR]->hostchip) == NULL) ) { CANMSG("There is no hardware support for the device file with minor nr.: %d\n",MINOR_NR); return -ENODEV; @@ -62,13 +62,13 @@ int can_open(struct inode *inode, struct file *file) openflag = can_msgobj_test_fl(obj,OPENED); // Martin Petera: store previous status can_msgobj_set_fl(obj,OPENED); - if (chip->flags & CHIP_CONFIGURED) + if (chip->flags & CHIP_CONFIGURED) DEBUGMSG("Device is already configured.\n"); else { if (chip->chipspecops->chip_config(chip)) CANMSG("Error configuring chip.\n"); else - chip->flags |= CHIP_CONFIGURED; + chip->flags |= CHIP_CONFIGURED; } /* End of chip configuration */ @@ -95,7 +95,7 @@ int can_open(struct inode *inode, struct file *file) if(qends == NULL) goto no_qends; canqueue_ends_init_kern(qends); canuser->qends = qends; - + /*required to synchronize with RT-Linux context*/ can_spin_lock_irqsave(&canuser_manipulation_lock, iflags); list_add(&canuser->peers, &obj->obj_users); @@ -112,7 +112,7 @@ int can_open(struct inode *inode, struct file *file) #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,50)) MOD_INC_USE_COUNT; -#endif +#endif return 0;