aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/video/gspca
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2008-09-03 16:48:01 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-09-03 18:36:49 -0300
commitd55b83d3c4558d0d118bf20ef3f1fa65b1c75c3d (patch)
tree2f8a2d0d37710538f1b932aa9c8091c3c50e7dd6 /drivers/media/video/gspca
parent05b809c702bf297690c63ea78ee117c4dc909028 (diff)
V4L/DVB (8710): gspca: Bad color control in sonixj.
Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca')
-rw-r--r--drivers/media/video/gspca/sonixj.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c
index b17aaa45270..c34e02dccd5 100644
--- a/drivers/media/video/gspca/sonixj.c
+++ b/drivers/media/video/gspca/sonixj.c
@@ -794,7 +794,7 @@ static int configure_gpio(struct gspca_dev *gspca_dev,
switch (sd->sensor) {
case SENSOR_OM6802:
- reg_w1(gspca_dev, 0x02, 0x71);
+ reg_w1(gspca_dev, 0x02, 0x73); /* was 71 */
reg_w1(gspca_dev, 0x01, 0x42);
reg_w1(gspca_dev, 0x17, 0x64);
reg_w1(gspca_dev, 0x01, 0x42);
@@ -1056,7 +1056,7 @@ static unsigned int setexposure(struct gspca_dev *gspca_dev,
expo = 0x0001;
gainOm[3] = expo >> 2;
i2c_w8(gspca_dev, gainOm);
- reg_w1(gspca_dev, 0x96, expo >> 5);
+ reg_w1(gspca_dev, 0x96, (expo >> 5) & 0x1f);
PDEBUG(D_CONF, "set exposure %d", gainOm[3]);
break;
}
@@ -1138,11 +1138,13 @@ static void setcolors(struct gspca_dev *gspca_dev)
int colour;
colour = sd->colors - 128;
- if (colour > 0)
+ if (colour > 0) {
data = (colour + 32) & 0x7f; /* blue */
- else
+ reg_w1(gspca_dev, 0x06, data);
+ } else {
data = (-colour + 32) & 0x7f; /* red */
- reg_w1(gspca_dev, 0x05, data);
+ reg_w1(gspca_dev, 0x05, data);
+ }
}
static void setautogain(struct gspca_dev *gspca_dev)