patch-2.1.104 linux/drivers/cdrom/cm206.c

• Lines: 36
• Date: Thu May 21 14:24:06 1998
• Orig file: v2.1.103/linux/drivers/cdrom/cm206.c
• Orig date: Thu Feb 12 20:56:05 1998

diff -u --recursive --new-file v2.1.103/linux/drivers/cdrom/cm206.c linux/drivers/cdrom/cm206.c
@@ -299,7 +299,7 @@
 {
   int loop=POLLOOP;
   while (!(inw(r_line_status) & ls_transmitter_buffer_empty) && loop>0) {
-    udelay(1000);		/* one millisec delay */
+    mdelay(1);		/* one millisec delay */
     --loop;
   }
   outw(command, r_uart_transmit);
@@ -309,7 +309,7 @@
 {
   int loop=POLLOOP;
   while (!(inw(r_line_status) & ls_receive_buffer_full) && loop>0) {
-    udelay(1000);
+    mdelay(1);
     --loop;
   }
   return ((uch) inw(r_uart_receive));
@@ -1194,7 +1194,7 @@
   stop_read();
   reset_cm260();
   outw(dc_normal | dc_break | READ_AHEAD, r_data_control);
-  udelay(1000);			/* 750 musec minimum */
+  mdelay(1);			/* 750 musec minimum */
   outw(dc_normal | READ_AHEAD, r_data_control);
   cd->sector_last = -1;		/* flag no data buffered */
   cd->adapter_last = -1;    
@@ -1358,7 +1358,7 @@
   /* Now, the problem here is that reset_cm260 can generate an
      interrupt. It seems that this can cause a kernel oops some time
      later. So we wait a while and `service' this interrupt. */
-  udelay(1000);
+  mdelay(1);
   outw(dc_normal | READ_AHEAD, r_data_control);
   sti();
   printk(" using IRQ %d\n", cm206_irq);