Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 241875
b: refs/heads/master
c: 5c95606
h: refs/heads/master
i:
  241873: 4959377
  241871: 13ee33f
v: v3
  • Loading branch information
Jean-François Moine authored and Mauro Carvalho Chehab committed Mar 21, 2011
1 parent f4c727e commit 3983224
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 15 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: 336d23ef88fd71564fb07fdc1d1d871f8e1eeadd
refs/heads/master: 5c95606b1d94a6dc62df0af2bc0d3e0e9a2e6cce
19 changes: 5 additions & 14 deletions trunk/drivers/media/video/gspca/sonixj.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ MODULE_AUTHOR("Jean-François Moine <http://moinejf.free.fr>");
MODULE_DESCRIPTION("GSPCA/SONIX JPEG USB Camera Driver");
MODULE_LICENSE("GPL");

static int starcam;

/* controls */
enum e_ctrl {
BRIGHTNESS,
Expand Down Expand Up @@ -2192,14 +2190,11 @@ static void setillum(struct gspca_dev *gspca_dev)
sd->ctrls[ILLUM].val ? 0x64 : 0x60);
break;
case SENSOR_MT9V111:
if (starcam)
reg_w1(gspca_dev, 0x02,
sd->ctrls[ILLUM].val ?
0x55 : 0x54); /* 370i */
else
reg_w1(gspca_dev, 0x02,
sd->ctrls[ILLUM].val ?
0x66 : 0x64); /* Clip */
reg_w1(gspca_dev, 0x02,
sd->ctrls[ILLUM].val ? 0x77 : 0x74);
/* should have been: */
/* 0x55 : 0x54); * 370i */
/* 0x66 : 0x64); * Clip */
break;
}
}
Expand Down Expand Up @@ -3114,7 +3109,3 @@ static void __exit sd_mod_exit(void)

module_init(sd_mod_init);
module_exit(sd_mod_exit);

module_param(starcam, int, 0644);
MODULE_PARM_DESC(starcam,
"StarCam model. 0: Clip, 1: 370i");

0 comments on commit 3983224

Please sign in to comment.