summaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/ivtv/ivtv-driver.h
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil-cisco@xs4all.nl>2022-03-06 12:29:11 +0100
committerHans Verkuil <hverkuil-cisco@xs4all.nl>2022-03-07 17:21:53 +0100
commit25e94139218c0293b4375233c14f2256d7dcfaa8 (patch)
tree25f12a439a4ca0b8db02e199443bef5fb624deed /drivers/media/pci/ivtv/ivtv-driver.h
parentmedia: rcar-csi2: Drop comma after SoC match table sentinel (diff)
downloadlinux-25e94139218c0293b4375233c14f2256d7dcfaa8.tar.xz
linux-25e94139218c0293b4375233c14f2256d7dcfaa8.zip
ivtv: fix incorrect device_caps for ivtvfb
The VIDIOC_G_FBUF and related overlay ioctls no longer worked (-ENOTTY was returned). The root cause was the introduction of the caps field in ivtv-driver.h. While loading the ivtvfb module would update the video_device device_caps field with V4L2_CAP_VIDEO_OUTPUT_OVERLAY it would not update that caps field, and that's what the overlay ioctls would look at. It's a bad idea to keep information in two places, so drop the caps field and only use vdev.device_caps. Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Reported-by: Martin Dauskardt <martin.dauskardt@gmx.de> Fixes: 2161536516ed (media: media/pci: set device_caps in struct video_device)
Diffstat (limited to 'drivers/media/pci/ivtv/ivtv-driver.h')
-rw-r--r--drivers/media/pci/ivtv/ivtv-driver.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/pci/ivtv/ivtv-driver.h b/drivers/media/pci/ivtv/ivtv-driver.h
index 4cf92dee6527..ce3a7ca51736 100644
--- a/drivers/media/pci/ivtv/ivtv-driver.h
+++ b/drivers/media/pci/ivtv/ivtv-driver.h
@@ -330,7 +330,6 @@ struct ivtv_stream {
struct ivtv *itv; /* for ease of use */
const char *name; /* name of the stream */
int type; /* stream type */
- u32 caps; /* V4L2 capabilities */
struct v4l2_fh *fh; /* pointer to the streaming filehandle */
spinlock_t qlock; /* locks access to the queues */