patch-1.3.78 linux/drivers/sound/ad1848.c

Next file: linux/drivers/sound/audio.c
Previous file: linux/drivers/sound/Readme.cards
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.77/linux/drivers/sound/ad1848.c linux/drivers/sound/ad1848.c
@@ -1152,9 +1152,9 @@
 {
 
   unsigned char   tmp;
-  int             i;
   ad1848_info    *devc = &dev_info[nr_ad1848_devs];
   unsigned char   tmp1 = 0xff, tmp2 = 0xff;
+  int             i;
 
   DDB (printk ("ad1848_detect(%x)\n", io_base));
 
@@ -1201,6 +1201,11 @@
       return 0;
     }
 
+  DDB (printk ("ad1848: regs: "));
+  for (i = 0; i < 32; i++)
+    DDB (printk ("%02x ", ad_read (devc, i)));
+  DDB (printk ("\n"));
+
   /*
      * Test if it's possible to change contents of the indirect registers.
      * Registers 0 and 1 are ADC volume registers. The bit 0x10 is read only
@@ -1254,15 +1259,6 @@
      * with CS4231.
    */
 
-  DDB (printk ("ad1848_detect() - step F\n"));
-  ad_write (devc, 12, 0);	/* Mode2=disabled */
-
-  for (i = 0; i < 16; i++)
-    if ((tmp1 = ad_read (devc, i)) != (tmp2 = ad_read (devc, i + 16)))
-      {
-	DDB (printk ("ad1848 detect error - step F(%d/%x/%x)\n", i, tmp1, tmp2));
-	return 0;
-      }
 
   /*
      * Try to switch the chip to mode2 (CS4231) by setting the MODE2 bit (0x40).

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this