diff --git a/[refs] b/[refs] index faacae44a152..b343a202086a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 41f09322e912fdfbd947d7363dec69cff96adc3d +refs/heads/master: b267b73d5a508eb9c92d9781d951f4c0d035481a diff --git a/trunk/drivers/media/video/gspca/topro.c b/trunk/drivers/media/video/gspca/topro.c index 29596c59837f..acb209a67100 100644 --- a/trunk/drivers/media/video/gspca/topro.c +++ b/trunk/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])