patch-2.2.14 linux/drivers/sbus/audio/dbri.c

• Lines: 54
• Date: Tue Jan 4 10:12:18 2000
• Orig file: v2.2.13/linux/drivers/sbus/audio/dbri.c
• Orig date: Tue Jan 4 11:10:37 2000

diff -u --recursive --new-file v2.2.13/linux/drivers/sbus/audio/dbri.c linux/drivers/sbus/audio/dbri.c
@@ -64,6 +64,7 @@
 #include <linux/errno.h>
 #include <linux/interrupt.h>
 #include <linux/malloc.h>
+#include <linux/ioport.h>
 #include <linux/version.h>
 #include <asm/openprom.h>
 #include <asm/oplib.h>
@@ -229,7 +230,7 @@
                         dbri->regs->reg8, dbri->regs->reg9)); 
 
 	dbri->regs->reg0 = D_R; /* Soft Reset */
-	for(i = 0; (dbri->regs->reg0 & D_R) && i < 10; i++)
+	for(i = 0; (dbri->regs->reg0 & D_R) && i < 64; i++)
 		udelay(10);
 }
 
@@ -370,9 +371,9 @@
         int rd;
         int status;
         void *buffer;
-        int count;
+        int count = 0;
         void (*callback)(void *, int, unsigned int) = NULL;
-        void *callback_arg;
+        void *callback_arg = NULL;
 
         if ((pipe < 0) || (pipe > 15)) {
                 printk("DBRI: invalid pipe in reception_complete_intr\n");
@@ -804,6 +805,7 @@
         dbri_cmdsend(dbri, cmd);
 }
 
+#if 0
 /* unlink_time_slot()
  *
  * I don't use this function, so it's basically untested.
@@ -865,6 +867,7 @@
 
         dbri_cmdsend(dbri, cmd);
 }
+#endif
 
 /* xmit_fixed() / recv_fixed()
  *
@@ -1475,7 +1478,7 @@
          * codec at this location on the CHI, so return false.
          */
 
-        i = 10;
+        i = 64;
         while (((dbri->mm.status & 0xe4) != 0x20) && --i) udelay(125);
         if (i == 0) {
 		return 0;