diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2009-02-19 19:38:31 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 17:42:53 +0200 |
| commit | 603538a085e42c02b9b3184b6104d73e22a7e5d1 (patch) | |
| tree | 00da447f443ad52216a7142820d99576385f1998 /drivers/media/video/gspca/zc3xx.c | |
| parent | V4L/DVB (10679): gspca - sonixj: Handle the webcam 0c45:613c instead of sn9c102. (diff) | |
| download | linux-603538a085e42c02b9b3184b6104d73e22a7e5d1.tar.xz linux-603538a085e42c02b9b3184b6104d73e22a7e5d1.zip | |
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>
Diffstat (limited to 'drivers/media/video/gspca/zc3xx.c')
| -rw-r--r-- | drivers/media/video/gspca/zc3xx.c | 13 |
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) 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 */ |