V4L/DVB (10680): gspca - zc3xx: Bad probe of the ov7xxx sensors.

This patch fixes one bug of the kernel bug report 12737.

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/gspca/zc3xx.c b/drivers/media/video/gspca/zc3xx.c
index e6a6cb946a21102c5ff00724b7a8645e263f5396..fb9b122ac61d0690748f0b37f702274910816cf1 100644 (file)
--- a/drivers/media/video/gspca/zc3xx.c
+++ b/drivers/media/video/gspca/zc3xx.c
@@ -6987,7 +6987,7 @@ static int vga_3wr_probe(struct gspca_dev *gspca_dev)
 static int zcxx_probeSensor(struct gspca_dev *gspca_dev)
 {
        struct sd *sd = (struct sd *) gspca_dev;
-       int sensor, sensor2;
+       int sensor;
 
        switch (sd->sensor) {
        case SENSOR_MC501CB:
@@ -7002,16 +7002,9 @@ static int zcxx_probeSensor(struct gspca_dev *gspca_dev)
                break;
        }
        sensor = vga_2wr_probe(gspca_dev);
-       if (sensor >= 0) {
-               if (sensor < 0x7600)
-                       return sensor;
-               /* next probe is needed for OmniVision ? */
-       }
-       sensor2 = vga_3wr_probe(gspca_dev);
-       if (sensor2 >= 0
-           && sensor >= 0)
+       if (sensor >= 0)
                return sensor;
-       return sensor2;
+       return vga_3wr_probe(gspca_dev);
 }
 
 /* this function is called at probe time */