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

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

diff --git a/drivers/media/video/gspca/ov519.c b/drivers/media/video/gspca/ov519.c
index 08b8ce1dee184a99d388520d4dba27b2afa617c3..739e8a2a2d308ea31268de9f625617d3dce27b0b 100644 (file)
--- a/drivers/media/video/gspca/ov519.c
+++ b/drivers/media/video/gspca/ov519.c
@@ -3348,7 +3348,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
        case BRIDGE_W9968CF:
                cam->cam_mode = w9968cf_vga_mode;
                cam->nmodes = ARRAY_SIZE(w9968cf_vga_mode);
-               cam->reverse_alts = 1;
                break;
        }
 
@@ -3684,8 +3683,8 @@ static void ov511_mode_init_regs(struct sd *sd)
        /* Check if we have enough bandwidth to disable compression */
        fps = (interlaced ? 60 : 30) / (sd->clockdiv + 1) + 1;
        needed = fps * sd->gspca_dev.width * sd->gspca_dev.height * 3 / 2;
-       /* 1400 is a conservative estimate of the max nr of isoc packets/sec */
-       if (needed > 1400 * packet_size) {
+       /* 1000 isoc packets/sec */
+       if (needed > 1000 * packet_size) {
                /* Enable Y and UV quantization and compression */
                reg_w(sd, R511_COMP_EN, 0x07);
                reg_w(sd, R511_COMP_LUT_EN, 0x03);