aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2008-11-25 02:47:09 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-30 06:38:47 -0500
commitb1b056a5f22851273813f7f1208b50fb7934f12a (patch)
tree03392dea2a6e4135d21b17e5439ca96d77174529 /drivers/media/video/gspca
parentabf485fe5136c4f828df2d07655d6dc7253894a5 (diff)
V4L/DVB (9842): gspca: Center the brightness in sonixj.
The brightness jumped from max to min at the middle of the control values. 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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c
index 34f7f58e527e..83564e09eeea 100644
--- a/drivers/media/video/gspca/sonixj.c
+++ b/drivers/media/video/gspca/sonixj.c
@@ -89,7 +89,7 @@ static struct ctrl sd_ctrls[] = {
89#define BRIGHTNESS_MAX 0xffff 89#define BRIGHTNESS_MAX 0xffff
90 .maximum = BRIGHTNESS_MAX, 90 .maximum = BRIGHTNESS_MAX,
91 .step = 1, 91 .step = 1,
92#define BRIGHTNESS_DEF 0x7fff 92#define BRIGHTNESS_DEF 0x8000
93 .default_value = BRIGHTNESS_DEF, 93 .default_value = BRIGHTNESS_DEF,
94 }, 94 },
95 .set = sd_setbrightness, 95 .set = sd_setbrightness,
@@ -1129,7 +1129,7 @@ static void setbrightness(struct gspca_dev *gspca_dev)
1129 unsigned int expo; 1129 unsigned int expo;
1130 __u8 k2; 1130 __u8 k2;
1131 1131
1132 k2 = sd->brightness >> 10; 1132 k2 = ((int) sd->brightness - 0x8000) >> 10;
1133 switch (sd->sensor) { 1133 switch (sd->sensor) {
1134 case SENSOR_HV7131R: 1134 case SENSOR_HV7131R:
1135 expo = sd->brightness << 4; 1135 expo = sd->brightness << 4;
@@ -1147,7 +1147,7 @@ static void setbrightness(struct gspca_dev *gspca_dev)
1147 case SENSOR_OM6802: 1147 case SENSOR_OM6802:
1148 expo = sd->brightness >> 6; 1148 expo = sd->brightness >> 6;
1149 sd->exposure = setexposure(gspca_dev, expo); 1149 sd->exposure = setexposure(gspca_dev, expo);
1150 k2 >>= 1; 1150 k2 = sd->brightness >> 11;
1151 break; 1151 break;
1152 } 1152 }
1153 1153