Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[~andy/linux] / drivers / media / video / gspca / topro.c

diff --git a/drivers/media/video/gspca/topro.c b/drivers/media/video/gspca/topro.c
index b2695b1dc6032a28312d411aa244db1979882759..444d3c5b90795db1c4c127d696c2a08fef7dd5fb 100644 (file)
--- a/drivers/media/video/gspca/topro.c
+++ b/drivers/media/video/gspca/topro.c
@@ -3946,7 +3946,7 @@ static int get_fr_idx(struct gspca_dev *gspca_dev)
                /* 640x480 * 30 fps does not work */
                if (i == 6                      /* if 30 fps */
                 && gspca_dev->width == 640)
-                       i = 0x86;               /* 15 fps */
+                       i = 0x05;               /* 15 fps */
        } else {
                for (i = 0; i < ARRAY_SIZE(rates_6810) - 1; i++) {
                        if (sd->framerate >= rates_6810[i])