aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2010-02-10 04:49:23 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-02-26 13:11:09 -0500
commit606f8428ca1c2fbc665f726b4f810b8d50b87954 (patch)
tree9a6cd9edc6a3d88a68879e698adfcdbb0d1019b7
parent9d3103d061224e939272d05d54192038f66ffd54 (diff)
V4L/DVB: Documentation: gspca.txt: update known mr97310a cams
Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--Documentation/video4linux/gspca.txt4
-rw-r--r--drivers/media/video/gspca/sonixb.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/video4linux/gspca.txt b/Documentation/video4linux/gspca.txt
index 939dda99e7d7..181b9e6fd984 100644
--- a/Documentation/video4linux/gspca.txt
+++ b/Documentation/video4linux/gspca.txt
@@ -229,8 +229,8 @@ sunplus 08ca:2050 Medion MD 41437
229sunplus 08ca:2060 Aiptek PocketDV5300 229sunplus 08ca:2060 Aiptek PocketDV5300
230tv8532 0923:010f ICM532 cams 230tv8532 0923:010f ICM532 cams
231mars 093a:050f Mars-Semi Pc-Camera 231mars 093a:050f Mars-Semi Pc-Camera
232mr97310a 093a:010e All four known CIF cams with this ID 232mr97310a 093a:010e All known CIF cams with this ID
233mr97310a 093a:010f All four known VGA cams with this ID 233mr97310a 093a:010f All known VGA cams with this ID
234pac207 093a:2460 Qtec Webcam 100 234pac207 093a:2460 Qtec Webcam 100
235pac207 093a:2461 HP Webcam 235pac207 093a:2461 HP Webcam
236pac207 093a:2463 Philips SPC 220 NC 236pac207 093a:2463 Philips SPC 220 NC
diff --git a/drivers/media/video/gspca/sonixb.c b/drivers/media/video/gspca/sonixb.c
index fda14200a050..81a7dd6a7240 100644
--- a/drivers/media/video/gspca/sonixb.c
+++ b/drivers/media/video/gspca/sonixb.c
@@ -240,7 +240,7 @@ static const struct ctrl sd_ctrls[] = {
240 .minimum = 0, 240 .minimum = 0,
241 .maximum = 2, /* 0: 0, 1: 50Hz, 2:60Hz */ 241 .maximum = 2, /* 0: 0, 1: 50Hz, 2:60Hz */
242 .step = 1, 242 .step = 1,
243#define FREQ_DEF 1 243#define FREQ_DEF 0
244 .default_value = FREQ_DEF, 244 .default_value = FREQ_DEF,
245 }, 245 },
246 .set = sd_setfreq, 246 .set = sd_setfreq,
@@ -944,7 +944,7 @@ static void do_autogain(struct gspca_dev *gspca_dev)
944 desired_avg_lum = 5000; 944 desired_avg_lum = 5000;
945 } else { 945 } else {
946 deadzone = 1500; 946 deadzone = 1500;
947 desired_avg_lum = 23000; 947 desired_avg_lum = 18000;
948 } 948 }
949 949
950 if (sensor_data[sd->sensor].flags & F_COARSE_EXPO) 950 if (sensor_data[sd->sensor].flags & F_COARSE_EXPO)