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

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

diff --git a/lincan/src/open_rtl.c b/lincan/src/open_rtl.c
index 155cdb013a8b17427822f5090247cdb2a41df2e3..66a5bac20392ef8c821c939b0523c943bc6a92e2 100644 (file)
--- a/lincan/src/open_rtl.c
+++ b/lincan/src/open_rtl.c
@@ -25,7 +25,7 @@ static inline
 int can_open_rtl_common(struct canuser_t *canuser, int open_flags)
 {
        struct msgobj_t *obj=canuser->msgobj;
-       struct chip_t *chip;
+       struct canchip_t *chip;
        struct canque_ends_t *qends;
        struct canque_edge_t *edge;
        can_spin_irqflags_t iflags;
@@ -93,7 +93,7 @@ int can_open_rtl_posix(struct rtl_file *fptr)
 {
        int ret;
        struct msgobj_t *obj;
-       struct chip_t *chip;
+       struct canchip_t *chip;
        struct canuser_t *canuser;
        int minor_nr = RTL_MINOR_FROM_FILEPTR(fptr);