]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
[media] em28xx: do not claim VBI support if the device is a camera
authorFrank Schaefer <fschaefer.oss@googlemail.com>
Thu, 7 Feb 2013 16:39:21 +0000 (13:39 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 4 Mar 2013 17:26:06 +0000 (14:26 -0300)
Avoids registering a VBI device and streaming in VBI-mode if the device is a
camera.

Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/usb/em28xx/em28xx-core.c

index aaedd11791f22fd4e1f7abc3fd2c3ef84d66123f..26d249971a016e03b7c209880c53dd9a46476e14 100644 (file)
@@ -681,6 +681,11 @@ int em28xx_vbi_supported(struct em28xx *dev)
        if (disable_vbi == 1)
                return 0;
 
+       if (dev->board.is_webcam)
+               return 0;
+
+       /* FIXME: check subdevices for VBI support */
+
        if (dev->chip_id == CHIP_ID_EM2860 ||
            dev->chip_id == CHIP_ID_EM2883)
                return 1;