aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/sonixj.c
diff options
context:
space:
mode:
authorJean-François Moine <moinejf@free.fr>2011-02-10 06:03:24 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-03-21 19:32:07 -0400
commit5c95606b1d94a6dc62df0af2bc0d3e0e9a2e6cce (patch)
tree47ec03726d357781690f2e0f98bc08a5166cf3ae /drivers/media/video/gspca/sonixj.c
parent336d23ef88fd71564fb07fdc1d1d871f8e1eeadd (diff)
[media] gspca - sonixj: Set both pins for infrared of mt9v111 webcams
This avoids to define the webcam model. Signed-off-by: Jean-François Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca/sonixj.c')
-rw-r--r--drivers/media/video/gspca/sonixj.c19
1 files changed, 5 insertions, 14 deletions
diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c
index 571d086eabe5..eb7b2613ab45 100644
--- a/drivers/media/video/gspca/sonixj.c
+++ b/drivers/media/video/gspca/sonixj.c
@@ -29,8 +29,6 @@ MODULE_AUTHOR("Jean-François Moine <http://moinejf.free.fr>");
29MODULE_DESCRIPTION("GSPCA/SONIX JPEG USB Camera Driver"); 29MODULE_DESCRIPTION("GSPCA/SONIX JPEG USB Camera Driver");
30MODULE_LICENSE("GPL"); 30MODULE_LICENSE("GPL");
31 31
32static int starcam;
33
34/* controls */ 32/* controls */
35enum e_ctrl { 33enum e_ctrl {
36 BRIGHTNESS, 34 BRIGHTNESS,
@@ -2192,14 +2190,11 @@ static void setillum(struct gspca_dev *gspca_dev)
2192 sd->ctrls[ILLUM].val ? 0x64 : 0x60); 2190 sd->ctrls[ILLUM].val ? 0x64 : 0x60);
2193 break; 2191 break;
2194 case SENSOR_MT9V111: 2192 case SENSOR_MT9V111:
2195 if (starcam) 2193 reg_w1(gspca_dev, 0x02,
2196 reg_w1(gspca_dev, 0x02, 2194 sd->ctrls[ILLUM].val ? 0x77 : 0x74);
2197 sd->ctrls[ILLUM].val ? 2195/* should have been: */
2198 0x55 : 0x54); /* 370i */ 2196/* 0x55 : 0x54); * 370i */
2199 else 2197/* 0x66 : 0x64); * Clip */
2200 reg_w1(gspca_dev, 0x02,
2201 sd->ctrls[ILLUM].val ?
2202 0x66 : 0x64); /* Clip */
2203 break; 2198 break;
2204 } 2199 }
2205} 2200}
@@ -3114,7 +3109,3 @@ static void __exit sd_mod_exit(void)
3114 3109
3115module_init(sd_mod_init); 3110module_init(sd_mod_init);
3116module_exit(sd_mod_exit); 3111module_exit(sd_mod_exit);
3117
3118module_param(starcam, int, 0644);
3119MODULE_PARM_DESC(starcam,
3120 "StarCam model. 0: Clip, 1: 370i");