From: ppisa <pisa@cmp.felk.cvut.cz>
Date: Wed, 1 Jun 2005 22:19:00 +0000 (+0200)
Subject: Merge: Ensure free of checked alloc memory in the case that module_init fails
X-Git-Tag: CLT_COMM_CAN_usb_can1_kriz_bp~60
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/commitdiff_plain/a412b1335a9906e768eeaf41473fe90193c435ab?hp=8a6d1eefec4b7cb8fd7d8919cf049664756a21b8

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

Merge commit 'remotes/sf-ocera-lincan/master'
---

diff --git a/lincan/src/main.c b/lincan/src/main.c
index bb6abbf..60eb6e6 100644
--- 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");
-		return -ENODEV;
+		goto register_error;
 	}
 
 	#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");
-		return -ENODEV;
 
+	register_error:
+		if ( can_del_mem_list() ) 
+			CANMSG("Error deallocating memory\n");
+
+		return -ENODEV;
 }
 
 void cleanup_module(void)
diff --git a/lincan/src/unican.c b/lincan/src/unican.c
index f72bacc..df556d6 100644
--- 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)