Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 124381
b: refs/heads/master
c: e18fd01
h: refs/heads/master
i:
  124379: 4adefe7
v: v3
  • Loading branch information
Jean-Francois Moine authored and Mauro Carvalho Chehab committed Dec 30, 2008
1 parent 10d5ca6 commit 1ed0a7e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2961e875ea1b9ef446e7533eff86e6711fd3a727
refs/heads/master: e18fd01e63aada731efbcadba6232fde28a20ff5
14 changes: 7 additions & 7 deletions trunk/drivers/media/video/gspca/vc032x.c
Original file line number Diff line number Diff line change
Expand Up @@ -1456,7 +1456,7 @@ static const struct sensor_info sensor_info_data[] = {
{SENSOR_OV7670, 0x80 | 0x21, 0x0a, 0x7673, 0x66, 0x67, 0x05},
{SENSOR_MI1310_SOC, 0x80 | 0x5d, 0x00, 0x143a, 0x24, 0x25, 0x01},
/* (tested in vc032x_probe_sensor) */
/* {SENSOR_MI0360, 0x80 | 0x5d, 0x00, 0x4382, 0x24, 0x25, 0x01}, */
/* {SENSOR_MI0360, 0x80 | 0x5d, 0x00, 0x8243, 0x24, 0x25, 0x01}, */
};

/* read 'len' bytes in gspca_dev->usb_buf */
Expand Down Expand Up @@ -1513,18 +1513,18 @@ static void read_sensor_register(struct gspca_dev *gspca_dev,
msleep(1);
}
reg_r(gspca_dev, 0xa1, 0xb33e, 1);
hdata = gspca_dev->usb_buf[0];
ldata = gspca_dev->usb_buf[0];
reg_r(gspca_dev, 0xa1, 0xb33d, 1);
mdata = gspca_dev->usb_buf[0];
reg_r(gspca_dev, 0xa1, 0xb33c, 1);
ldata = gspca_dev->usb_buf[0];
PDEBUG(D_PROBE, "Read Sensor %02x %02x%02x",
hdata = gspca_dev->usb_buf[0];
PDEBUG(D_PROBE, "Read Sensor %02x%02x %02x",
hdata, mdata, ldata);
reg_r(gspca_dev, 0xa1, 0xb334, 1);
if (gspca_dev->usb_buf[0] == 0x02)
*value = (ldata << 8) + mdata;
*value = (hdata << 8) + mdata;
else
*value = ldata;
*value = hdata;
}

static int vc032x_probe_sensor(struct gspca_dev *gspca_dev)
Expand All @@ -1551,7 +1551,7 @@ static int vc032x_probe_sensor(struct gspca_dev *gspca_dev)

/* special case for MI0360 */
if (ptsensor_info->sensorId == SENSOR_MI1310_SOC
&& value == 0x4382)
&& value == 0x8243)
return ptsensor_info->sensorId;
}
return -1;
Expand Down

0 comments on commit 1ed0a7e

Please sign in to comment.