summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/ivtv/ivtv-fileops.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-01-29 10:51:00 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-01-29 10:51:00 -0200
commit7c0917f006a519be5e54c6405f54dea61ca06b7a (patch)
tree47a8e3218398355b7ba1cdf59b9390afa003fdc9 /linux/drivers/media/video/ivtv/ivtv-fileops.c
parentb1ccf703c9015bc3257716ffccd33ca147f7a1a8 (diff)
parent68a6fa1ae421b7c28eb6b8365f3adfd08007e7b7 (diff)
downloadmediapointer-dvb-s2-7c0917f006a519be5e54c6405f54dea61ca06b7a.tar.gz
mediapointer-dvb-s2-7c0917f006a519be5e54c6405f54dea61ca06b7a.tar.bz2
commit backport
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/ivtv/ivtv-fileops.c')
-rw-r--r--linux/drivers/media/video/ivtv/ivtv-fileops.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-fileops.c b/linux/drivers/media/video/ivtv/ivtv-fileops.c
index d594bc29f..617667d1c 100644
--- a/linux/drivers/media/video/ivtv/ivtv-fileops.c
+++ b/linux/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));