]> Pileus Git - ~andy/linux/commitdiff
[media] pwc: Fix codec1 cameras no longer working
authorHans de Goede <hdegoede@redhat.com>
Mon, 8 Oct 2012 09:05:24 +0000 (06:05 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 21 Nov 2012 15:05:57 +0000 (13:05 -0200)
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/usb/pwc/pwc-ctrl.c

index 1f506fde97d0a52433a7477f6ac843cc60af1f2f..3a1618580ed6c6a774713fb44e8c6fcab8d31c5c 100644 (file)
@@ -179,6 +179,8 @@ static int set_video_mode_Nala(struct pwc_device *pdev, int size, int pixfmt,
                return -EINVAL;
        if (frames < 4)
                frames = 4;
+       else if (size > PSZ_QCIF && frames > 15)
+               frames = 15;
        else if (frames > 25)
                frames = 25;
        frames = frames2frames[frames];