Commit 616cfb69 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

media: omap3isp: 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: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent eefe332c

drivers/media/platform/omap3isp/ispvideo.c

+7 −4
Original line number Original line Diff line number Diff line
@@ -658,10 +658,6 @@ isp_video_querycap(struct file *file, void *fh, struct v4l2_capability *cap) 
	cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT

	cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT

		| V4L2_CAP_STREAMING | V4L2_CAP_DEVICE_CAPS;

		| V4L2_CAP_STREAMING | V4L2_CAP_DEVICE_CAPS;





	if (video->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)

		cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;

	else

		cap->device_caps = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING;





	return 0;

	return 0;

}

}
@@ -1460,6 +1456,13 @@ int omap3isp_video_init(struct isp_video *video, const char *name) 
	video->video.vfl_type = VFL_TYPE_GRABBER;

	video->video.vfl_type = VFL_TYPE_GRABBER;

	video->video.release = video_device_release_empty;

	video->video.release = video_device_release_empty;

	video->video.ioctl_ops = &isp_video_ioctl_ops;

	video->video.ioctl_ops = &isp_video_ioctl_ops;

	if (video->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)

		video->video.device_caps = V4L2_CAP_VIDEO_CAPTURE

					 | V4L2_CAP_STREAMING;

	else

		video->video.device_caps = V4L2_CAP_VIDEO_OUTPUT

					 | V4L2_CAP_STREAMING;



	video->pipe.stream_state = ISP_PIPELINE_STREAM_STOPPED;

	video->pipe.stream_state = ISP_PIPELINE_STREAM_STOPPED;





	video_set_drvdata(&video->video, video);

	video_set_drvdata(&video->video, video);