From 9c07a43b13694255d3a70eec2c4e5a812b1dd6d4 Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Mon, 1 Mar 2010 08:53:34 -0300 Subject: [PATCH] --- yaml --- r: 192790 b: refs/heads/master c: 18cf8c91ad558f8d2d0177656df493f81949cfe6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/gspca/ov534.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5f80f7bf5141..803b97fad17e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f2938822523739e99a39fd634943865a432e9c00 +refs/heads/master: 18cf8c91ad558f8d2d0177656df493f81949cfe6 diff --git a/trunk/drivers/media/video/gspca/ov534.c b/trunk/drivers/media/video/gspca/ov534.c index 2d8965003077..4fda0980be04 100644 --- a/trunk/drivers/media/video/gspca/ov534.c +++ b/trunk/drivers/media/video/gspca/ov534.c @@ -686,6 +686,15 @@ static void setexposure(struct gspca_dev *gspca_dev) struct sd *sd = (struct sd *) gspca_dev; u8 val; + if (sd->aec) + return; + + /* 'val' is one byte and represents half of the exposure value we are + * going to set into registers, a two bytes value: + * + * MSB: ((u16) val << 1) >> 8 == val >> 7 + * LSB: ((u16) val << 1) & 0xff == val << 1 + */ val = sd->exposure; sccb_reg_write(gspca_dev, 0x08, val >> 7); sccb_reg_write(gspca_dev, 0x10, val << 1);