summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2009-07-08 05:21:50 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-07-24 14:03:29 -0300
commit27954930f047df73a16253db2750345034e56c40 (patch)
treea28472888e6f0b761903d1ec0021730908108076 /drivers
parenta84f79aed688a94197387830df3a2f2068f49dc0 (diff)
downloadkernel-crypto-27954930f047df73a16253db2750345034e56c40.tar.gz
kernel-crypto-27954930f047df73a16253db2750345034e56c40.tar.xz
kernel-crypto-27954930f047df73a16253db2750345034e56c40.zip
V4L/DVB (12267): gspca - sonixj: Bad sensor init of non ov76xx sensors.
The bug was introduced when adding the light frequency control Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/gspca/sonixj.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c
index 0d02f41fa7d..bad309b90cc 100644
--- a/drivers/media/video/gspca/sonixj.c
+++ b/drivers/media/video/gspca/sonixj.c
@@ -1634,6 +1634,8 @@ static void setfreq(struct gspca_dev *gspca_dev)
{
struct sd *sd = (struct sd *) gspca_dev;
+ if (gspca_dev->ctrl_dis & (1 << FREQ_IDX))
+ return;
if (sd->sensor == SENSOR_OV7660) {
switch (sd->freq) {
case 0: /* Banding filter disabled */