diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-21 15:26:11 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-21 15:26:11 -0300 |
| commit | 37cd1fdb9dd4dc835d2cbd05ebd12b39593bfd42 (patch) | |
| tree | 974f630d6a67db2bd28e20fc55a3f076483d36e4 /linux/drivers/media/video/cpia2 | |
| parent | 16659a1919874e2a99f44778de6594b8a6b3f65f (diff) | |
| parent | 6cfc8eeff6261fb1153a67e5bc3c71616f332044 (diff) | |
| download | mediapointer-dvb-s2-37cd1fdb9dd4dc835d2cbd05ebd12b39593bfd42.tar.gz mediapointer-dvb-s2-37cd1fdb9dd4dc835d2cbd05ebd12b39593bfd42.tar.bz2 | |
merge: http://linuxtv.org/hg/~rmcc/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/cpia2')
| -rw-r--r-- | linux/drivers/media/video/cpia2/cpia2_v4l.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cpia2/cpia2_v4l.c b/linux/drivers/media/video/cpia2/cpia2_v4l.c index 481e178ef..28d93c595 100644 --- a/linux/drivers/media/video/cpia2/cpia2_v4l.c +++ b/linux/drivers/media/video/cpia2/cpia2_v4l.c @@ -1167,9 +1167,9 @@ static int ioctl_g_ctrl(void *arg,struct camera_data *cam) } else { if(cam->params.flicker_control.cam_register & CPIA2_VP_FLICKER_MODES_50HZ) { - mode = FLICKER_50; + mode = FLICKER_50; } else { - mode = FLICKER_60; + mode = FLICKER_60; } } for(i=0; i<NUM_FLICKER_CONTROLS; i++) { |