| Message ID | 20190626074421.38739-10-hverkuil-cisco@xs4all.nl (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media/platform: set device_caps in struct video_device | expand |
Hi Hans, Thank you for the patch. On 26/06/2019 9:44 AM, Hans Verkuil wrote: > 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. > > Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> > Cc: Fabien Dessenne <fabien.dessenne@st.com> Reviewed-by: Fabien Dessenne <fabien.dessenne@st.com> > --- > drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/drivers/media/platform/sti/bdisp/bdisp-v4l2.c b/drivers/media/platform/sti/bdisp/bdisp-v4l2.c > index 79f7db1a9d18..e90f1ba30574 100644 > --- a/drivers/media/platform/sti/bdisp/bdisp-v4l2.c > +++ b/drivers/media/platform/sti/bdisp/bdisp-v4l2.c > @@ -692,11 +692,6 @@ static int bdisp_querycap(struct file *file, void *fh, > strscpy(cap->card, bdisp->pdev->name, sizeof(cap->card)); > snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:%s%d", > BDISP_NAME, bdisp->id); > - > - cap->device_caps = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_M2M; > - > - cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; > - > return 0; > } > > @@ -1059,6 +1054,7 @@ static int bdisp_register_device(struct bdisp_dev *bdisp) > bdisp->vdev.lock = &bdisp->lock; > bdisp->vdev.vfl_dir = VFL_DIR_M2M; > bdisp->vdev.v4l2_dev = &bdisp->v4l2_dev; > + bdisp->vdev.device_caps = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_M2M; > snprintf(bdisp->vdev.name, sizeof(bdisp->vdev.name), "%s.%d", > BDISP_NAME, bdisp->id); >
diff --git a/drivers/media/platform/sti/bdisp/bdisp-v4l2.c b/drivers/media/platform/sti/bdisp/bdisp-v4l2.c index 79f7db1a9d18..e90f1ba30574 100644 --- a/drivers/media/platform/sti/bdisp/bdisp-v4l2.c +++ b/drivers/media/platform/sti/bdisp/bdisp-v4l2.c @@ -692,11 +692,6 @@ static int bdisp_querycap(struct file *file, void *fh, strscpy(cap->card, bdisp->pdev->name, sizeof(cap->card)); snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:%s%d", BDISP_NAME, bdisp->id); - - cap->device_caps = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_M2M; - - cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; - return 0; } @@ -1059,6 +1054,7 @@ static int bdisp_register_device(struct bdisp_dev *bdisp) bdisp->vdev.lock = &bdisp->lock; bdisp->vdev.vfl_dir = VFL_DIR_M2M; bdisp->vdev.v4l2_dev = &bdisp->v4l2_dev; + bdisp->vdev.device_caps = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_M2M; snprintf(bdisp->vdev.name, sizeof(bdisp->vdev.name), "%s.%d", BDISP_NAME, bdisp->id);
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. Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Cc: Fabien Dessenne <fabien.dessenne@st.com> --- drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)