aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/gspca/zc3xx.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/media/video/gspca/zc3xx.c b/drivers/media/video/gspca/zc3xx.c
index e6a6cb946a21..fb9b122ac61d 100644
--- 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)
6987static int zcxx_probeSensor(struct gspca_dev *gspca_dev) 6987static int zcxx_probeSensor(struct gspca_dev *gspca_dev)
6988{ 6988{
6989 struct sd *sd = (struct sd *) gspca_dev; 6989 struct sd *sd = (struct sd *) gspca_dev;
6990 int sensor, sensor2; 6990 int sensor;
6991 6991
6992 switch (sd->sensor) { 6992 switch (sd->sensor) {
6993 case SENSOR_MC501CB: 6993 case SENSOR_MC501CB:
@@ -7002,16 +7002,9 @@ static int zcxx_probeSensor(struct gspca_dev *gspca_dev)
7002 break; 7002 break;
7003 } 7003 }
7004 sensor = vga_2wr_probe(gspca_dev); 7004 sensor = vga_2wr_probe(gspca_dev);
7005 if (sensor >= 0) { 7005 if (sensor >= 0)
7006 if (sensor < 0x7600)
7007 return sensor;
7008 /* next probe is needed for OmniVision ? */
7009 }
7010 sensor2 = vga_3wr_probe(gspca_dev);
7011 if (sensor2 >= 0
7012 && sensor >= 0)
7013 return sensor; 7006 return sensor;
7014 return sensor2; 7007 return vga_3wr_probe(gspca_dev);
7015} 7008}
7016 7009
7017/* this function is called at probe time */ 7010/* this function is called at probe time */