aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/sonixj.c
diff options
context:
space:
mode:
authorJean-François Moine <moinejf@free.fr>2010-10-21 03:09:34 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-21 12:26:30 -0400
commit75f05ba09f50ef934cf6dbe9bf7460a9618d8e88 (patch)
tree0c4f0f77c25dbf3bf78ada26b5750736c3b80c3e /drivers/media/video/gspca/sonixj.c
parent0303a90a744662e934877a5d637a43197229274b (diff)
[media] gspca - sonixj: Fix a regression with sensor hv7131r
The bug was introduced by commit d5aa3856fd09ad0ea04619d6cba31192dac08e84 removing the probe sequence of hv7131r with bridge sn9c120 and so, letting the sensor inactive. Signed-off-by: Jean-François Moine <moinejf@free.fr> Cc: stable@kernel.org 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.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c
index fa942734207a..c0573c405a11 100644
--- a/drivers/media/video/gspca/sonixj.c
+++ b/drivers/media/video/gspca/sonixj.c
@@ -1856,8 +1856,7 @@ static void bridge_init(struct gspca_dev *gspca_dev,
1856 reg_w1(gspca_dev, 0x01, 0x43); 1856 reg_w1(gspca_dev, 0x01, 0x43);
1857 reg_w1(gspca_dev, 0x17, 0x61); 1857 reg_w1(gspca_dev, 0x17, 0x61);
1858 reg_w1(gspca_dev, 0x01, 0x42); 1858 reg_w1(gspca_dev, 0x01, 0x42);
1859 if (sd->sensor == SENSOR_HV7131R 1859 if (sd->sensor == SENSOR_HV7131R)
1860 && sd->bridge == BRIDGE_SN9C102P)
1861 hv7131r_probe(gspca_dev); 1860 hv7131r_probe(gspca_dev);
1862 break; 1861 break;
1863 } 1862 }