[media] gspca - sonixj: Fix a regression with sensor hv7131r
authorJean-François Moine <moinejf@free.fr>
Thu, 21 Oct 2010 07:09:34 +0000 (04:09 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 21 Oct 2010 16:26:30 +0000 (14:26 -0200)
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>
drivers/media/video/gspca/sonixj.c

index fa942734207a53d799065798687e93cf13e8ac06..c0573c405a11bf978d10591e3e08a361e35bab65 100644 (file)
@@ -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;
        }