aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/gspca/m5602/m5602_ov9650.c9
-rw-r--r--drivers/media/video/gspca/m5602/m5602_ov9650.h2
2 files changed, 3 insertions, 8 deletions
diff --git a/drivers/media/video/gspca/m5602/m5602_ov9650.c b/drivers/media/video/gspca/m5602/m5602_ov9650.c
index de45649c739c..da6b72a7cf6f 100644
--- a/drivers/media/video/gspca/m5602/m5602_ov9650.c
+++ b/drivers/media/video/gspca/m5602/m5602_ov9650.c
@@ -75,8 +75,8 @@ const static struct ctrl ov9650_ctrls[] = {
75 .type = V4L2_CTRL_TYPE_INTEGER, 75 .type = V4L2_CTRL_TYPE_INTEGER,
76 .name = "exposure", 76 .name = "exposure",
77 .minimum = 0x00, 77 .minimum = 0x00,
78 .maximum = 0xffff, 78 .maximum = 0x1ff,
79 .step = 0x1, 79 .step = 0x4,
80 .default_value = EXPOSURE_DEFAULT, 80 .default_value = EXPOSURE_DEFAULT,
81 .flags = V4L2_CTRL_FLAG_SLIDER 81 .flags = V4L2_CTRL_FLAG_SLIDER
82 }, 82 },
@@ -407,11 +407,6 @@ int ov9650_get_exposure(struct gspca_dev *gspca_dev, __s32 *val)
407 u8 i2c_data; 407 u8 i2c_data;
408 int err; 408 int err;
409 409
410 err = m5602_read_sensor(sd, OV9650_COM1, &i2c_data, 1);
411 if (err < 0)
412 return err;
413 *val = i2c_data & 0x03;
414
415 err = m5602_read_sensor(sd, OV9650_AECH, &i2c_data, 1); 410 err = m5602_read_sensor(sd, OV9650_AECH, &i2c_data, 1);
416 if (err < 0) 411 if (err < 0)
417 return err; 412 return err;
diff --git a/drivers/media/video/gspca/m5602/m5602_ov9650.h b/drivers/media/video/gspca/m5602/m5602_ov9650.h
index 08ae7ea96ffa..ca0e42ee05ce 100644
--- a/drivers/media/video/gspca/m5602/m5602_ov9650.h
+++ b/drivers/media/video/gspca/m5602/m5602_ov9650.h
@@ -123,7 +123,7 @@
123#define GAIN_DEFAULT 0x14 123#define GAIN_DEFAULT 0x14
124#define RED_GAIN_DEFAULT 0x70 124#define RED_GAIN_DEFAULT 0x70
125#define BLUE_GAIN_DEFAULT 0x20 125#define BLUE_GAIN_DEFAULT 0x20
126#define EXPOSURE_DEFAULT 0x5003 126#define EXPOSURE_DEFAULT 0x1ff
127 127
128/*****************************************************************************/ 128/*****************************************************************************/
129 129