X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/05dd2640c82d97d88f0bcab5344630f24212836b..074e90ee2a9a0a573bc987097650e9c1ec233337:/lincan/src/m437.c

diff --git a/lincan/src/m437.c b/lincan/src/m437.c
index 2786106..da772e8 100644
--- a/lincan/src/m437.c
+++ b/lincan/src/m437.c
@@ -36,7 +36,7 @@
 
 /*
  * This driver has been designed to support "Memory (MEM)" mode.
- * For example: Memory, MEM:0xD0000 => io=0xD0000. 
+ * For example: Memory, MEM:0xD0000 => io=0xD0000.
  * Configure the card with m437set.com provided by seco before loading driver.
  * This software is released under the GPL-License.
  */
@@ -140,24 +140,24 @@ int m437_release_io(struct candevice_t *candev)
 	 */
 #if 0 /* Object reset method */
 	unsigned i;
-	
+
         /* disable IRQ generation */
         m437_write_register(iCTL_CCE, candev->dev_base_addr+iCTL);
 
 	/* clear all message objects */
 	for (i=1; i<=15; i++) {
 		m437_write_register(
-				INTPD_RES | 
-				RXIE_RES | 
-				TXIE_RES | 
-				MVAL_RES, 
+				INTPD_RES |
+				RXIE_RES |
+				TXIE_RES |
+				MVAL_RES,
 				candev->dev_base_addr+i*0x10+iMSGCTL0);
 		m437_write_register(
-				NEWD_RES | 
-				MLST_RES | 
-				CPUU_RES | 
-				TXRQ_RES | 
-				RMPD_RES, 
+				NEWD_RES |
+				MLST_RES |
+				CPUU_RES |
+				TXRQ_RES |
+				RMPD_RES,
 				candev->dev_base_addr+i*0x10+iMSGCTL1);
 	}
 
@@ -202,7 +202,7 @@ int m437_reset(struct candevice_t *candev)
 	/* Check hardware reset status */
 	i=0;
 	while ( (m437_read_register(candev->dev_base_addr+iCPU) & iCPU_RST) && (i<=15)) {
-		udelay(20000);
+		mdelay(20);
 		i++;
 	}
 	if (i>=15) {