From: Harald Welte * use milliseconds as parameter for mdelay, not jiffies * clarify that dev->mdelay parameter is in jiffies * use del_timer_sync() instead of del_timer() Signed-off-by: Harald Welte Signed-off-by: Andrew Morton --- drivers/char/pcmcia/cm4000_cs.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff -puN drivers/char/pcmcia/cm4000_cs.c~cm4000-cardman-4000-driver-update drivers/char/pcmcia/cm4000_cs.c --- 25/drivers/char/pcmcia/cm4000_cs.c~cm4000-cardman-4000-driver-update Tue Sep 20 14:26:43 2005 +++ 25-akpm/drivers/char/pcmcia/cm4000_cs.c Tue Sep 20 14:26:43 2005 @@ -132,7 +132,7 @@ struct cm4000_dev { unsigned char cwarn; /* slow down warning */ unsigned char flags0; /* cardman IO-flags 0 */ unsigned char flags1; /* cardman IO-flags 1 */ - unsigned int mdelay; /* variable monitor speeds */ + unsigned int mdelay; /* variable monitor speeds, in jiffies */ unsigned int baudv; /* baud value for speed */ unsigned char ta1; @@ -566,7 +566,7 @@ static int set_protocol(struct cm4000_de DEBUGP(5, dev, "NumRecBytes is valid\n"); break; } - mdelay(T_10MSEC); + mdelay(10); } if (i == 100) { DEBUGP(5, dev, "Timeout waiting for NumRecBytes getting " @@ -582,7 +582,7 @@ static int set_protocol(struct cm4000_de DEBUGP(2, dev, "NumRecBytes = %i\n", num_bytes_read); break; } - mdelay(T_10MSEC); + mdelay(10); } /* check whether it is a short PTS reply? */ @@ -680,7 +680,7 @@ static void terminate_monitor(struct cm4 msleep(25); DEBUGP(5, dev, "Delete timer\n"); - del_timer(&dev->timer); + del_timer_sync(&dev->timer); #ifdef PCMCIA_DEBUG dev->monitor_running = 0; #endif _