aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/gspca/sonixj.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c
index 7daa60299c0..46ec24e4045 100644
--- a/drivers/media/video/gspca/sonixj.c
+++ b/drivers/media/video/gspca/sonixj.c
@@ -218,7 +218,7 @@ static struct ctrl sd_ctrls[] = {
218 .minimum = 0, 218 .minimum = 0,
219 .maximum = 1, 219 .maximum = 1,
220 .step = 1, 220 .step = 1,
221#define VFLIP_DEF 0 /* vflip def = 1 for ov7630 */ 221#define VFLIP_DEF 0
222 .default_value = VFLIP_DEF, 222 .default_value = VFLIP_DEF,
223 }, 223 },
224 .set = sd_setvflip, 224 .set = sd_setvflip,
@@ -1321,10 +1321,7 @@ static int sd_config(struct gspca_dev *gspca_dev,
1321 sd->gamma = GAMMA_DEF; 1321 sd->gamma = GAMMA_DEF;
1322 sd->autogain = AUTOGAIN_DEF; 1322 sd->autogain = AUTOGAIN_DEF;
1323 sd->ag_cnt = -1; 1323 sd->ag_cnt = -1;
1324 if (sd->sensor != SENSOR_OV7630) 1324 sd->vflip = VFLIP_DEF;
1325 sd->vflip = 0;
1326 else
1327 sd->vflip = 1;
1328 sd->infrared = INFRARED_DEF; 1325 sd->infrared = INFRARED_DEF;
1329 sd->freq = FREQ_DEF; 1326 sd->freq = FREQ_DEF;
1330 sd->quality = QUALITY_DEF; 1327 sd->quality = QUALITY_DEF;
@@ -1613,12 +1610,15 @@ static void setvflip(struct sd *sd)
1613{ 1610{
1614 u8 comn; 1611 u8 comn;
1615 1612
1616 if (sd->sensor == SENSOR_OV7630) 1613 if (sd->sensor == SENSOR_OV7630) {
1617 comn = 0x02; 1614 comn = 0x02;
1618 else 1615 if (!sd->vflip)
1616 comn |= 0x80;
1617 } else {
1619 comn = 0x06; 1618 comn = 0x06;
1620 if (sd->vflip) 1619 if (sd->vflip)
1621 comn |= 0x80; 1620 comn |= 0x80;
1621 }
1622 i2c_w1(&sd->gspca_dev, 0x75, comn); 1622 i2c_w1(&sd->gspca_dev, 0x75, comn);
1623} 1623}
1624 1624