aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/ov519.c
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2010-01-09 17:22:34 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-02-26 13:10:40 -0500
commitd02134ddb6fc351ab25028bfb45a53d08a2bcfbf (patch)
treeca6fed72555eaf7ad580c68c038ef41d46220c2b /drivers/media/video/gspca/ov519.c
parent035d3a3d3fb0104bb94dfb78ef70c7ec6f3f4ae4 (diff)
V4L/DVB (13999): gspca_ov519: remove non functioning contrast control for ov764x sensor
gspca_ov519: remove non functioning contrast control for ov764x sensor Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca/ov519.c')
-rw-r--r--drivers/media/video/gspca/ov519.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/video/gspca/ov519.c b/drivers/media/video/gspca/ov519.c
index abd200a947db..f94f41eb222e 100644
--- a/drivers/media/video/gspca/ov519.c
+++ b/drivers/media/video/gspca/ov519.c
@@ -141,6 +141,7 @@ static void setautobrightness(struct sd *sd);
141static void setfreq(struct sd *sd); 141static void setfreq(struct sd *sd);
142 142
143static const struct ctrl sd_ctrls[] = { 143static const struct ctrl sd_ctrls[] = {
144#define BRIGHTNESS_IDX 0
144 { 145 {
145 { 146 {
146 .id = V4L2_CID_BRIGHTNESS, 147 .id = V4L2_CID_BRIGHTNESS,
@@ -155,6 +156,7 @@ static const struct ctrl sd_ctrls[] = {
155 .set = sd_setbrightness, 156 .set = sd_setbrightness,
156 .get = sd_getbrightness, 157 .get = sd_getbrightness,
157 }, 158 },
159#define CONTRAST_IDX 1
158 { 160 {
159 { 161 {
160 .id = V4L2_CID_CONTRAST, 162 .id = V4L2_CID_CONTRAST,
@@ -169,6 +171,7 @@ static const struct ctrl sd_ctrls[] = {
169 .set = sd_setcontrast, 171 .set = sd_setcontrast,
170 .get = sd_getcontrast, 172 .get = sd_getcontrast,
171 }, 173 },
174#define COLOR_IDX 2
172 { 175 {
173 { 176 {
174 .id = V4L2_CID_SATURATION, 177 .id = V4L2_CID_SATURATION,
@@ -3118,8 +3121,10 @@ static int sd_config(struct gspca_dev *gspca_dev,
3118 } 3121 }
3119 sd->quality = QUALITY_DEF; 3122 sd->quality = QUALITY_DEF;
3120 if (sd->sensor == SEN_OV7640 || 3123 if (sd->sensor == SEN_OV7640 ||
3121 sd->sensor == SEN_OV7648 || 3124 sd->sensor == SEN_OV7648)
3122 sd->sensor == SEN_OV7670) 3125 gspca_dev->ctrl_dis |= (1 << AUTOBRIGHT_IDX) |
3126 (1 << CONTRAST_IDX);
3127 if (sd->sensor == SEN_OV7670)
3123 gspca_dev->ctrl_dis |= 1 << AUTOBRIGHT_IDX; 3128 gspca_dev->ctrl_dis |= 1 << AUTOBRIGHT_IDX;
3124 /* OV8610 Frequency filter control should work but needs testing */ 3129 /* OV8610 Frequency filter control should work but needs testing */
3125 if (sd->sensor == SEN_OV8610) 3130 if (sd->sensor == SEN_OV8610)
@@ -4180,11 +4185,6 @@ static void setcontrast(struct gspca_dev *gspca_dev)
4180 i2c_w(sd, 0x64, ctab[val >> 4]); 4185 i2c_w(sd, 0x64, ctab[val >> 4]);
4181 break; 4186 break;
4182 } 4187 }
4183 case SEN_OV7640:
4184 case SEN_OV7648:
4185 /* Use gain control instead. */
4186 i2c_w(sd, OV7610_REG_GAIN, val >> 2);
4187 break;
4188 case SEN_OV7670: 4188 case SEN_OV7670:
4189 /* check that this isn't just the same as ov7610 */ 4189 /* check that this isn't just the same as ov7610 */
4190 i2c_w(sd, OV7670_REG_CONTRAS, val >> 1); 4190 i2c_w(sd, OV7670_REG_CONTRAS, val >> 1);