aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2011-02-21 09:30:30 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-03-21 19:32:11 -0400
commit76fafe78df9e4062b9b6595f3225a2c0c2847ae5 (patch)
treed7b954eea5a99d5b3c636f7209a244ccd986e37f /drivers/media/video/gspca
parent49b61ec9b5afdb739e07bc085ed12678bc932a22 (diff)
[media] gspca_cpia1: Don't allow the framerate divisor to go above 2
Having a framerate divisor of 3 is not really necesarry and leads to various troubles (frames going missing, compression issues) when allowed. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca')
-rw-r--r--drivers/media/video/gspca/cpia1.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/gspca/cpia1.c b/drivers/media/video/gspca/cpia1.c
index 4bf2cab98d6..2a4a428f201 100644
--- a/drivers/media/video/gspca/cpia1.c
+++ b/drivers/media/video/gspca/cpia1.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * cpia CPiA (1) gspca driver 2 * cpia CPiA (1) gspca driver
3 * 3 *
4 * Copyright (C) 2010 Hans de Goede <hdegoede@redhat.com> 4 * Copyright (C) 2010-2011 Hans de Goede <hdegoede@redhat.com>
5 * 5 *
6 * This module is adapted from the in kernel v4l1 cpia driver which is : 6 * This module is adapted from the in kernel v4l1 cpia driver which is :
7 * 7 *
@@ -1400,7 +1400,7 @@ static void monitor_exposure(struct gspca_dev *gspca_dev)
1400 if ((sd->exposure_status == EXPOSURE_VERY_DARK || 1400 if ((sd->exposure_status == EXPOSURE_VERY_DARK ||
1401 sd->exposure_status == EXPOSURE_DARK) && 1401 sd->exposure_status == EXPOSURE_DARK) &&
1402 sd->exposure_count >= DARK_TIME * framerate && 1402 sd->exposure_count >= DARK_TIME * framerate &&
1403 sd->params.sensorFps.divisor < 3) { 1403 sd->params.sensorFps.divisor < 2) {
1404 1404
1405 /* dark for too long */ 1405 /* dark for too long */
1406 ++sd->params.sensorFps.divisor; 1406 ++sd->params.sensorFps.divisor;
@@ -1456,7 +1456,7 @@ static void monitor_exposure(struct gspca_dev *gspca_dev)
1456 if ((sd->exposure_status == EXPOSURE_VERY_DARK || 1456 if ((sd->exposure_status == EXPOSURE_VERY_DARK ||
1457 sd->exposure_status == EXPOSURE_DARK) && 1457 sd->exposure_status == EXPOSURE_DARK) &&
1458 sd->exposure_count >= DARK_TIME * framerate && 1458 sd->exposure_count >= DARK_TIME * framerate &&
1459 sd->params.sensorFps.divisor < 3) { 1459 sd->params.sensorFps.divisor < 2) {
1460 1460
1461 /* dark for too long */ 1461 /* dark for too long */
1462 ++sd->params.sensorFps.divisor; 1462 ++sd->params.sensorFps.divisor;