Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 181475
b: refs/heads/master
c: 5092451
h: refs/heads/master
i:
  181473: f6bd29c
  181471: 83434ab
v: v3
  • Loading branch information
Jean-Francois Moine authored and Mauro Carvalho Chehab committed Feb 26, 2010
1 parent ef7de9a commit 12730ad
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 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: 77880ba3335e60acd0d6a818a7cdddaf0a5d601f
refs/heads/master: 509245171ae76e08f657fe825b739d99f5701f09
6 changes: 2 additions & 4 deletions trunk/drivers/media/video/gspca/zc3xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -6783,7 +6783,6 @@ static int sd_start(struct gspca_dev *gspca_dev)
{
struct sd *sd = (struct sd *) gspca_dev;
struct usb_device *dev = gspca_dev->dev;
const struct usb_action *zc3_init;
int mode;
static const struct usb_action *init_tb[SENSOR_MAX][2] = {
{adcm2700_Initial, adcm2700_InitialScale}, /* 0 */
Expand Down Expand Up @@ -6816,8 +6815,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
0x21); /* JPEG 422 */
jpeg_set_qual(sd->jpeg_hdr, sd->quality);

mode = gspca_dev->cam.cam_mode[(int) gspca_dev->curr_mode].priv;
zc3_init = init_tb[sd->sensor][mode];
mode = gspca_dev->cam.cam_mode[gspca_dev->curr_mode].priv;
switch (sd->sensor) {
case SENSOR_HV7131C:
zcxx_probeSensor(gspca_dev);
Expand All @@ -6826,7 +6824,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
usb_exchange(gspca_dev, pas106b_Initial_com);
break;
}
usb_exchange(gspca_dev, zc3_init);
usb_exchange(gspca_dev, init_tb[sd->sensor][mode]);

switch (sd->sensor) {
case SENSOR_ADCM2700:
Expand Down

0 comments on commit 12730ad

Please sign in to comment.