mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
media: bttv: fix WARNING regression on tunerless devices
[ Upstream commitef058cc8b7
] Commit2161536516
("media: media/pci: set device_caps in struct video_device") introduced a regression: V4L2_CAP_TUNER is always present in device_caps, even when the device has no tuner. This causes a warning: WARNING: CPU: 0 PID: 249 at drivers/media/v4l2-core/v4l2-ioctl.c:1102 v4l_querycap+0xa0/0xb0 [videodev] Fixes:2161536516
("media: media/pci: set device_caps in struct video_device") Signed-off-by: Ondrej Zary <linux@zary.sk> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
efac3af1b5
commit
506769d5a3
1 changed files with 2 additions and 2 deletions
|
@ -3890,7 +3890,7 @@ static int bttv_register_video(struct bttv *btv)
|
|||
|
||||
/* video */
|
||||
vdev_init(btv, &btv->video_dev, &bttv_video_template, "video");
|
||||
btv->video_dev.device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_TUNER |
|
||||
btv->video_dev.device_caps = V4L2_CAP_VIDEO_CAPTURE |
|
||||
V4L2_CAP_READWRITE | V4L2_CAP_STREAMING;
|
||||
if (btv->tuner_type != TUNER_ABSENT)
|
||||
btv->video_dev.device_caps |= V4L2_CAP_TUNER;
|
||||
|
@ -3911,7 +3911,7 @@ static int bttv_register_video(struct bttv *btv)
|
|||
/* vbi */
|
||||
vdev_init(btv, &btv->vbi_dev, &bttv_video_template, "vbi");
|
||||
btv->vbi_dev.device_caps = V4L2_CAP_VBI_CAPTURE | V4L2_CAP_READWRITE |
|
||||
V4L2_CAP_STREAMING | V4L2_CAP_TUNER;
|
||||
V4L2_CAP_STREAMING;
|
||||
if (btv->tuner_type != TUNER_ABSENT)
|
||||
btv->vbi_dev.device_caps |= V4L2_CAP_TUNER;
|
||||
|
||||
|
|
Loading…
Reference in a new issue