Ensure free of checked alloc memory in the case that module_init fails

and unused Unican function deleted.

diff --git a/lincan/src/main.c b/lincan/src/main.c
index bb6abbff6dca4309ec20b9c974da2407136ecb26..60eb6e6799c429a652dc0dcf73df9ea1167ed681 100644 (file)
--- a/lincan/src/main.c
+++ b/lincan/src/main.c
@@ -195,7 +195,7 @@ int init_module(void)
        res=register_chrdev(major,DEVICE_NAME, &can_fops);
        if (res<0) {
                CANMSG("Error registering driver.\n");
        res=register_chrdev(major,DEVICE_NAME, &can_fops);
        if (res<0) {
                CANMSG("Error registering driver.\n");

-               return -ENODEV;
+               goto register_error;

        }
 
        #ifdef CAN_WITH_RTL
        }
 
        #ifdef CAN_WITH_RTL


@@ -300,8 +300,12 @@ int init_module(void)
                        CANMSG("Error unloading CAN driver, error: %d\n",res);
                else
                        CANMSG("No CAN devices or driver setup error.\n");
                        CANMSG("Error unloading CAN driver, error: %d\n",res);
                else
                        CANMSG("No CAN devices or driver setup error.\n");

-               return -ENODEV;

 
 

+       register_error:
+               if ( can_del_mem_list() ) 
+                       CANMSG("Error deallocating memory\n");
+
+               return -ENODEV;

 }
 
 void cleanup_module(void)
 }
 
 void cleanup_module(void)

diff --git a/lincan/src/unican.c b/lincan/src/unican.c
index f72bacc169eca68433c8f865ae82fa69df807abc..df556d611b7fbafaca8cfdbf934dbcbd2d19e644 100644 (file)
--- a/lincan/src/unican.c
+++ b/lincan/src/unican.c
@@ -29,18 +29,6 @@ static void unican_delay(long msdelay)
 
 }
 
 
 }
 

-
-long unican_bus_latency(struct msgobj_t *obj)
-{
-       long latency;
-       latency=obj->hostchip->baudrate;
-       if(latency){
-               latency=(long)HZ*1000/latency;
-       }
-       return latency;
-}
-
-

 /* * * unican Chip Functionality * * */
 
 int unican_enable_configuration(struct canchip_t *chip)
 /* * * unican Chip Functionality * * */
 
 int unican_enable_configuration(struct canchip_t *chip)