summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/video/cx88/cx88-core.c4
-rw-r--r--v4l/ChangeLog8
2 files changed, 11 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-core.c b/linux/drivers/media/video/cx88/cx88-core.c
index 1b2d591d0..22e6b3830 100644
--- a/linux/drivers/media/video/cx88/cx88-core.c
+++ b/linux/drivers/media/video/cx88/cx88-core.c
@@ -1,5 +1,5 @@
/*
- * $Id: cx88-core.c,v 1.47 2005/11/06 17:01:47 mchehab Exp $
+ * $Id: cx88-core.c,v 1.48 2005/11/18 15:13:50 mchehab Exp $
*
* device driver for Conexant 2388x based TV cards
* driver core
@@ -916,9 +916,11 @@ static int set_tvaudio(struct cx88_core *core)
cx88_set_tvaudio(core);
/* cx88_set_stereo(dev,V4L2_TUNER_MODE_STEREO); */
+#if 0 /* This is needed only on cx88-alsa */
cx_write(MO_AUDD_LNGTH, 128); /* fifo size */
cx_write(MO_AUDR_LNGTH, 128); /* fifo size */
cx_write(MO_AUD_DMACNTRL, 0x03); /* need audio fifo */
+#endif
return 0;
}
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index f462b3f27..9ad41aa9e 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-18 15:10 mchehab
+
+ * ../linux/drivers/media/video/cx88/cx88-core.c: (set_tvaudio):
+ - Commented code that enables audio DMA transfers at cx88-core.
+ - This stuff should be at cx88-alsa when ready.
+
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
2005-11-18 15:04 mchehab
* ../linux/drivers/media/video/cx88/cx88-tvaudio.c: