aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-François Moine <moinejf@free.fr>2011-02-10 08:03:24 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-03-21 20:32:07 -0300
commit5c95606b1d94a6dc62df0af2bc0d3e0e9a2e6cce (patch)
tree47ec03726d357781690f2e0f98bc08a5166cf3ae
parent336d23ef88fd71564fb07fdc1d1d871f8e1eeadd (diff)
downloadkernel_samsung_smdk4412-5c95606b1d94a6dc62df0af2bc0d3e0e9a2e6cce.zip
kernel_samsung_smdk4412-5c95606b1d94a6dc62df0af2bc0d3e0e9a2e6cce.tar.gz
kernel_samsung_smdk4412-5c95606b1d94a6dc62df0af2bc0d3e0e9a2e6cce.tar.bz2
[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>
-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 571d086..eb7b261 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>");
MODULE_DESCRIPTION("GSPCA/SONIX JPEG USB Camera Driver");
MODULE_LICENSE("GPL");
-static int starcam;
-
/* controls */
enum e_ctrl {
BRIGHTNESS,
@@ -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;
}
}
@@ -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");