20ea6adbf1
Build system: x86_64 Build-tested: bcm2708, bcm2709, bcm2710, bcm2711 Run-tested: bcm2708/RPiB+, bcm2709/RPi3B, bcm2710/RPi3B, bcm2711/RPi4B Signed-off-by: Marty Jones <mj8263788@gmail.com> Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
From e60e756a1354d248a01b4e1cd231c0ceb9d97a20 Mon Sep 17 00:00:00 2001
|
|
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
Date: Tue, 24 Mar 2020 23:13:02 +0200
|
|
Subject: [PATCH] media: bcm2835-unicam: Disable event-related ioctls
|
|
on metadata node
|
|
|
|
The unicam driver supports both the SOURCE_CHANGE and CTRL events. Both
|
|
events are only generated on the image video node, so the event-related
|
|
ioctls are useless on the medatada node. Disable them.
|
|
|
|
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
|
|
Reviewed-by: Naushir Patuck <naush@raspberrypi.com>
|
|
---
|
|
drivers/media/platform/bcm2835/bcm2835-unicam.c | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
--- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
|
|
+++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
|
|
@@ -2374,6 +2374,11 @@ static int register_node(struct unicam_d
|
|
return -ENOMEM;
|
|
}
|
|
|
|
+ if (node->pad_id == METADATA_PAD) {
|
|
+ v4l2_disable_ioctl(vdev, VIDIOC_DQEVENT);
|
|
+ v4l2_disable_ioctl(vdev, VIDIOC_SUBSCRIBE_EVENT);
|
|
+ v4l2_disable_ioctl(vdev, VIDIOC_UNSUBSCRIBE_EVENT);
|
|
+ }
|
|
if (node->pad_id == METADATA_PAD ||
|
|
!v4l2_subdev_has_op(unicam->sensor, video, s_std)) {
|
|
v4l2_disable_ioctl(&node->video_dev, VIDIOC_S_STD);
|