summaryrefslogtreecommitdiff
path: root/drivers/media/video
diff options
context:
space:
mode:
authorJean-François Moine <moinejf@free.fr>2010-10-21 07:09:34 (GMT)
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-21 16:26:30 (GMT)
commit75f05ba09f50ef934cf6dbe9bf7460a9618d8e88 (patch)
tree0c4f0f77c25dbf3bf78ada26b5750736c3b80c3e /drivers/media/video
parent0303a90a744662e934877a5d637a43197229274b (diff)
downloadlinux-fsl-qoriq-75f05ba09f50ef934cf6dbe9bf7460a9618d8e88.tar.xz
[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')
-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 fa94273..c0573c4 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,
reg_w1(gspca_dev, 0x01, 0x43);
reg_w1(gspca_dev, 0x17, 0x61);
reg_w1(gspca_dev, 0x01, 0x42);
- if (sd->sensor == SENSOR_HV7131R
- && sd->bridge == BRIDGE_SN9C102P)
+ if (sd->sensor == SENSOR_HV7131R)
hv7131r_probe(gspca_dev);
break;
}