patch-2.2.15 linux/drivers/char/buz.c

Next file: linux/drivers/char/c-qcam.c
Previous file: linux/drivers/char/bttv.c
Back to the patch index
Back to the overall index

diff -u --new-file --recursive --exclude-from ../../exclude v2.2.14/drivers/char/buz.c linux/drivers/char/buz.c
@@ -3167,13 +3167,17 @@
 			mdelay(10);
 			zr36060_reset(zr);
 			mdelay(10);
-			zr36060_sleep(zr, 1);
-			mdelay(10);
+//			zr36060_sleep(zr, 1);
+//			mdelay(10);
 	
 			/* display codec revision */
 			if ((rev=zr36060_read_8(zr, 0x022)) == 0x33) {
 				printk(KERN_INFO "%s: Zoran ZR36060 (rev %d)\n",
 			       zr->name, zr36060_read_8(zr, 0x023));
+			}
+			else if ((rev=zr36060_read_8(zr, 0x022)) == 0xA2) {
+				printk(KERN_INFO "%s: Zoran ZR36060 (rev %d)\n",
+			       zr->name, zr36060_read_8(zr, 0x023));
 			} else {
 				printk(KERN_ERR "%s: Zoran ZR36060 not found (Rev=%d)\n", zr->name, rev);
 				kfree((void *) zr->stat_com);
@@ -3205,8 +3209,8 @@
 			udelay(3000);
 			zr36060_reset(zr);
 			udelay(3000);
-			zr36060_sleep(zr, 1);
-			udelay(3000);
+//			zr36060_sleep(zr, 1);
+//			udelay(3000);
 
 			/* display codec revision */
 			if ((rev=zr36060_read_8(zr, 0x022)) == 0x33) {

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)