This is an automatic generated email to let you know that the following patch 
were queued:

Subject: media: bttv: fix WARNING regression on tunerless devices
Author:  Ondrej Zary <[email protected]>
Date:    Sat Dec 25 22:58:44 2021 +0100

Commit 2161536516ed ("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: 2161536516ed ("media: media/pci: set device_caps in struct video_device")
Signed-off-by: Ondrej Zary <[email protected]>
Signed-off-by: Hans Verkuil <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>

 drivers/media/pci/bt8xx/bttv-driver.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

---

diff --git a/drivers/media/pci/bt8xx/bttv-driver.c 
b/drivers/media/pci/bt8xx/bttv-driver.c
index 8cc9bec43688..5ca3d0cc653a 100644
--- a/drivers/media/pci/bt8xx/bttv-driver.c
+++ b/drivers/media/pci/bt8xx/bttv-driver.c
@@ -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;
 

_______________________________________________
linuxtv-commits mailing list
[email protected]
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to