From: Frank Schaefer Date: Thu, 7 Feb 2013 16:39:21 +0000 (-0300) Subject: [media] em28xx: do not claim VBI support if the device is a camera X-Git-Tag: firefly_0821_release~3680^2~618^2~670 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=84e902aa05b628b940c4a17ea2c92ec4fbcffc18;p=firefly-linux-kernel-4.4.55.git [media] em28xx: do not claim VBI support if the device is a camera Avoids registering a VBI device and streaming in VBI-mode if the device is a camera. Signed-off-by: Frank Schäfer Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/usb/em28xx/em28xx-core.c b/drivers/media/usb/em28xx/em28xx-core.c index aaedd11791f2..26d249971a01 100644 --- a/drivers/media/usb/em28xx/em28xx-core.c +++ b/drivers/media/usb/em28xx/em28xx-core.c @@ -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;