diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-10 23:47:09 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-10 23:47:09 -0300 |
commit | a3d0d5ee36893ba81fd1fb4c1db13ccbd9e1eca0 (patch) | |
tree | 4cbddf2cc585f898a25253311384392f6296d030 /linux/drivers/media/video/gspca/zc3xx.c | |
parent | d7ee909f5bbab277d4306e914505b71a7a54898f (diff) | |
parent | cf429ba94ebb6f6534b84b302888be78267d6d24 (diff) | |
download | mediapointer-dvb-s2-a3d0d5ee36893ba81fd1fb4c1db13ccbd9e1eca0.tar.gz mediapointer-dvb-s2-a3d0d5ee36893ba81fd1fb4c1db13ccbd9e1eca0.tar.bz2 |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-cleanups
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/gspca/zc3xx.c')
-rw-r--r-- | linux/drivers/media/video/gspca/zc3xx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/gspca/zc3xx.c b/linux/drivers/media/video/gspca/zc3xx.c index 782952b7a..3153bd4cd 100644 --- a/linux/drivers/media/video/gspca/zc3xx.c +++ b/linux/drivers/media/video/gspca/zc3xx.c @@ -6581,8 +6581,8 @@ static int setlightfreq(struct gspca_dev *gspca_dev) cs2102_60HZ, cs2102_60HZScale}, /* SENSOR_CS2102K 1 */ {cs2102_NoFliker, cs2102_NoFlikerScale, - cs2102_50HZ, cs2102_50HZScale, - cs2102_60HZ, cs2102_60HZScale}, + NULL, NULL, /* currently disabled */ + NULL, NULL}, /* SENSOR_GC0305 2 */ {gc0305_NoFliker, gc0305_NoFliker, gc0305_50HZ, gc0305_50HZ, |