You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
From d06677b96fc10122363028dea9ca06e5f9899865 Mon Sep 17 00:00:00 2001
|
|
From: Chen-Yu Tsai <wens@csie.org>
|
|
Date: Mon, 22 Jul 2019 22:20:55 +0800
|
|
Subject: [PATCH] staging: bcm2835-codec: set device_caps in struct
|
|
video_device
|
|
|
|
Instead of filling in the struct v4l2_capability device_caps
|
|
field, fill in the struct video_device device_caps field.
|
|
|
|
That way the V4L2 core knows what the capabilities of the
|
|
video device are.
|
|
|
|
This is similar to a cleanup series by Hans Verkuil [1].
|
|
|
|
[1] https://www.spinics.net/lists/linux-media/msg153313.html
|
|
|
|
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
|
|
---
|
|
.../staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
--- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
|
|
+++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
|
|
@@ -945,8 +945,6 @@ static int vidioc_querycap(struct file *
|
|
strncpy(cap->card, MEM2MEM_NAME, sizeof(cap->card) - 1);
|
|
snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:%s",
|
|
MEM2MEM_NAME);
|
|
- cap->device_caps = V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_STREAMING;
|
|
- cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
|
|
return 0;
|
|
}
|
|
|
|
@@ -2600,6 +2598,7 @@ static int bcm2835_codec_create(struct p
|
|
vfd = &dev->vfd;
|
|
vfd->lock = &dev->dev_mutex;
|
|
vfd->v4l2_dev = &dev->v4l2_dev;
|
|
+ vfd->device_caps = V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_STREAMING;
|
|
|
|
switch (role) {
|
|
case DECODE:
|