mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-21 10:01:00 +00:00
Code Issues Releases Wiki Activity

V4L/DVB (13999): gspca_ov519: remove non functioning contrast control for ov764x sensor

Browse source 
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>
This commit is contained in:
Hans de Goede 2010-01-09 19:22:34 -03:00 committed by Mauro Carvalho Chehab
parent 035d3a3d3f
commit d02134ddb6
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/media/video/gspca/ov519.c
View file

@ -141,6 +141,7 @@ static void setautobrightness(struct sd *sd);
static void setfreq(struct sd *sd); static void setfreq(struct sd *sd);
static const struct ctrl sd_ctrls[] = { static const struct ctrl sd_ctrls[] = {
#define BRIGHTNESS_IDX 0
{ {
{ {
.id = V4L2_CID_BRIGHTNESS, .id = V4L2_CID_BRIGHTNESS,
@ -155,6 +156,7 @@ static const struct ctrl sd_ctrls[] = {
.set = sd_setbrightness, .set = sd_setbrightness,
.get = sd_getbrightness, .get = sd_getbrightness,
}, },
#define CONTRAST_IDX 1
{ {
{ {
.id = V4L2_CID_CONTRAST, .id = V4L2_CID_CONTRAST,
@ -169,6 +171,7 @@ static const struct ctrl sd_ctrls[] = {
.set = sd_setcontrast, .set = sd_setcontrast,
.get = sd_getcontrast, .get = sd_getcontrast,
}, },
#define COLOR_IDX 2
{ {
{ {
.id = V4L2_CID_SATURATION, .id = V4L2_CID_SATURATION,
@ -3118,8 +3121,10 @@ static int sd_config(struct gspca_dev *gspca_dev,
} }
sd->quality = QUALITY_DEF; sd->quality = QUALITY_DEF;
if (sd->sensor == SEN_OV7640 || if (sd->sensor == SEN_OV7640 ||
sd->sensor == SEN_OV7648 || sd->sensor == SEN_OV7648)
sd->sensor == SEN_OV7670) gspca_dev->ctrl_dis |= (1 << AUTOBRIGHT_IDX) |
(1 << CONTRAST_IDX);
if (sd->sensor == SEN_OV7670)
gspca_dev->ctrl_dis |= 1 << AUTOBRIGHT_IDX; gspca_dev->ctrl_dis |= 1 << AUTOBRIGHT_IDX;
/* OV8610 Frequency filter control should work but needs testing */ /* OV8610 Frequency filter control should work but needs testing */
if (sd->sensor == SEN_OV8610) if (sd->sensor == SEN_OV8610)
@ -4180,11 +4185,6 @@ static void setcontrast(struct gspca_dev *gspca_dev)
i2c_w(sd, 0x64, ctab[val >> 4]); i2c_w(sd, 0x64, ctab[val >> 4]);
break; break;
} }
case SEN_OV7640:
case SEN_OV7648:
/* Use gain control instead. */
i2c_w(sd, OV7610_REG_GAIN, val >> 2);
break;
case SEN_OV7670: case SEN_OV7670:
/* check that this isn't just the same as ov7610 */ /* check that this isn't just the same as ov7610 */
i2c_w(sd, OV7670_REG_CONTRAS, val >> 1); i2c_w(sd, OV7670_REG_CONTRAS, val >> 1);