V4L/DVB (10276): cx18, cx2341x, ivtv: Add AC-3 audio encoding control to cx18

Initial addition of controls to set AC-3 audio encoding for the CX23418 - it
does not work yet due to firmware or cx18 driver issues.  This change affects
the common cx2341x and ivtv modules due to shared structures and
common functions.

Signed-off-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

2 files changed, 5 insertions, 5 deletions

diff --git a/drivers/media/video/ivtv/ivtv-driver.h b/drivers/media/video/ivtv/ivtv-driver.h
index ce8d9b74357e..94f7f44d5989 100644
--- a/drivers/media/video/ivtv/ivtv-driver.h
+++ b/drivers/media/video/ivtv/ivtv-driver.h
@@ -696,7 +696,7 @@ struct ivtv {
         u64 vbi_data_inserted;          /* number of VBI bytes inserted into the MPEG stream */
         u32 last_dec_timing[3];         /* cache last retrieved pts/scr/frame values */
         unsigned long dualwatch_jiffies;/* jiffies value of the previous dualwatch check */
-        u16 dualwatch_stereo_mode;      /* current detected dualwatch stereo mode */
+        u32 dualwatch_stereo_mode;      /* current detected dualwatch stereo mode */
 
 
         /* VBI state info */
diff --git a/drivers/media/video/ivtv/ivtv-fileops.c b/drivers/media/video/ivtv/ivtv-fileops.c
index d594bc29f07f..617667d1ceba 100644
--- a/drivers/media/video/ivtv/ivtv-fileops.c
+++ b/drivers/media/video/ivtv/ivtv-fileops.c
@@ -148,10 +148,10 @@ void ivtv_release_stream(struct ivtv_stream *s)
 static void ivtv_dualwatch(struct ivtv *itv)
 {
         struct v4l2_tuner vt;
-        u16 new_bitmap;
-        u16 new_stereo_mode;
-        const u16 stereo_mask = 0x0300;
-        const u16 dual = 0x0200;
+        u32 new_bitmap;
+        u32 new_stereo_mode;
+        const u32 stereo_mask = 0x0300;
+        const u32 dual = 0x0200;
 
         new_stereo_mode = itv->params.audio_properties & stereo_mask;
         memset(&vt, 0, sizeof(vt));