From 32b9422ba375838d6ad4c53339d41d23a05464e4 Mon Sep 17 00:00:00 2001 From: Erik Andr?n Date: Wed, 31 Dec 2008 07:25:42 -0300 Subject: [PATCH] --- yaml --- r: 142485 b: refs/heads/master c: 7136e705d8db46f22657523ee108be35c59ce3e9 h: refs/heads/master i: 142483: 7fd1f69a5c09981e2b47755759302b24df12b4ae v: v3 --- [refs] | 2 +- trunk/drivers/media/video/gspca/m5602/m5602_ov9650.c | 9 ++------- trunk/drivers/media/video/gspca/m5602/m5602_ov9650.h | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 5a5874f54b81..a2b6a0b6c400 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5a0489b3beb9de0c42f2a93113d6bd148473ac9b +refs/heads/master: 7136e705d8db46f22657523ee108be35c59ce3e9 diff --git a/trunk/drivers/media/video/gspca/m5602/m5602_ov9650.c b/trunk/drivers/media/video/gspca/m5602/m5602_ov9650.c index de45649c739c..da6b72a7cf6f 100644 --- a/trunk/drivers/media/video/gspca/m5602/m5602_ov9650.c +++ b/trunk/drivers/media/video/gspca/m5602/m5602_ov9650.c @@ -75,8 +75,8 @@ const static struct ctrl ov9650_ctrls[] = { .type = V4L2_CTRL_TYPE_INTEGER, .name = "exposure", .minimum = 0x00, - .maximum = 0xffff, - .step = 0x1, + .maximum = 0x1ff, + .step = 0x4, .default_value = EXPOSURE_DEFAULT, .flags = V4L2_CTRL_FLAG_SLIDER }, @@ -407,11 +407,6 @@ int ov9650_get_exposure(struct gspca_dev *gspca_dev, __s32 *val) u8 i2c_data; int err; - err = m5602_read_sensor(sd, OV9650_COM1, &i2c_data, 1); - if (err < 0) - return err; - *val = i2c_data & 0x03; - err = m5602_read_sensor(sd, OV9650_AECH, &i2c_data, 1); if (err < 0) return err; diff --git a/trunk/drivers/media/video/gspca/m5602/m5602_ov9650.h b/trunk/drivers/media/video/gspca/m5602/m5602_ov9650.h index 08ae7ea96ffa..ca0e42ee05ce 100644 --- a/trunk/drivers/media/video/gspca/m5602/m5602_ov9650.h +++ b/trunk/drivers/media/video/gspca/m5602/m5602_ov9650.h @@ -123,7 +123,7 @@ #define GAIN_DEFAULT 0x14 #define RED_GAIN_DEFAULT 0x70 #define BLUE_GAIN_DEFAULT 0x20 -#define EXPOSURE_DEFAULT 0x5003 +#define EXPOSURE_DEFAULT 0x1ff /*****************************************************************************/