From: Hans Verkuil Date: Wed, 26 Jun 2019 07:15:23 +0000 (-0400) Subject: media: via-camera: set device_caps in struct video_device X-Git-Tag: v5.4-rc1~145^2~308 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0fe3331e07f0a09c10fd81e48976255b50b2e607;p=tomoyo%2Ftomoyo-test1.git media: via-camera: 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. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/platform/via-camera.c b/drivers/media/platform/via-camera.c index d5f811820be9..4110dc4c771e 100644 --- a/drivers/media/platform/via-camera.c +++ b/drivers/media/platform/via-camera.c @@ -988,9 +988,6 @@ static int viacam_querycap(struct file *filp, void *priv, { strscpy(cap->driver, "via-camera", sizeof(cap->driver)); strscpy(cap->card, "via-camera", sizeof(cap->card)); - cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | - V4L2_CAP_READWRITE | V4L2_CAP_STREAMING; - cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; return 0; } @@ -1267,6 +1264,8 @@ static const struct video_device viacam_v4l_template = { .fops = &viacam_fops, .ioctl_ops = &viacam_ioctl_ops, .release = video_device_release_empty, /* Check this */ + .device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE | + V4L2_CAP_STREAMING, }; /*