From 891e66fa1bae15b1dbf0b3d695e65f254621e55c Mon Sep 17 00:00:00 2001 From: Jean-Francois Moine Date: Wed, 8 Jul 2009 05:21:50 -0300 Subject: [PATCH] --- yaml --- r: 155786 b: refs/heads/master c: 27954930f047df73a16253db2750345034e56c40 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/gspca/sonixj.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 848316d0ce71..d525c1ae8e09 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a84f79aed688a94197387830df3a2f2068f49dc0 +refs/heads/master: 27954930f047df73a16253db2750345034e56c40 diff --git a/trunk/drivers/media/video/gspca/sonixj.c b/trunk/drivers/media/video/gspca/sonixj.c index 0d02f41fa7d0..bad309b90cce 100644 --- a/trunk/drivers/media/video/gspca/sonixj.c +++ b/trunk/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 */