diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-22 20:59:21 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-22 20:59:21 -0200 |
| commit | 7a8fd78dab48f8bf00654b303fb9bc86e4fa28b9 (patch) | |
| tree | 97e5225cb20e188c19c377d1f115e4ae1f37f34a /linux/drivers/media/video/ivtv/ivtv-fileops.c | |
| parent | e7ada1bf7bbfdee58d7637d9716fdd8d8b76e4a7 (diff) | |
| parent | de00985e053e5742126ccd5299ac49047fecec88 (diff) | |
| download | mediapointer-dvb-s2-7a8fd78dab48f8bf00654b303fb9bc86e4fa28b9.tar.gz mediapointer-dvb-s2-7a8fd78dab48f8bf00654b303fb9bc86e4fa28b9.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
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.c | 8 |
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)); |