diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2009-02-19 19:38:31 +0100 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2009-02-19 19:38:31 +0100 |
| commit | 36c7a4cef04513ddb801f8b65ce0b8fcc0228d87 (patch) | |
| tree | e902b1d2e12557efe5a0b3d793df24f32f963170 /linux/drivers/media/video | |
| parent | e9e48721ed72a07c7d841000bfaeda024af28217 (diff) | |
| download | mediapointer-dvb-s2-36c7a4cef04513ddb801f8b65ce0b8fcc0228d87.tar.gz mediapointer-dvb-s2-36c7a4cef04513ddb801f8b65ce0b8fcc0228d87.tar.bz2 | |
gspca - zc3xx: Bad probe of the ov7xxx sensors.
From: Jean-Francois Moine <moinejf@free.fr>
This patch fixes one bug of the kernel bug report 12737.
Priority: normal
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Diffstat (limited to 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/gspca/zc3xx.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/linux/drivers/media/video/gspca/zc3xx.c b/linux/drivers/media/video/gspca/zc3xx.c index b93573f66..c885146cc 100644 --- a/linux/drivers/media/video/gspca/zc3xx.c +++ b/linux/drivers/media/video/gspca/zc3xx.c @@ -7016,7 +7016,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: @@ -7031,16 +7031,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 */ |