Commit 793ad32d authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mauro Carvalho Chehab
Browse files

[media] exynos4-is: Correct querycap ioctl handling at fimc-lite driver 



Fill in properly bus_info and card fields and set device_caps.
The querycap ioctl handler is renamed for consistency with the
other ioctls.

Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 8a0c28f5

drivers/media/platform/exynos4-is/fimc-lite.c

+10 −5
Original line number Diff line number Diff line
@@ -637,13 +637,18 @@ static void fimc_lite_try_compose(struct fimc_lite *fimc, struct v4l2_rect *r) 
/*

 * Video node ioctl operations

 */

static int fimc_vidioc_querycap_capture(struct file *file, void *priv,

static int fimc_lite_querycap(struct file *file, void *priv,

					struct v4l2_capability *cap)

{

	struct fimc_lite *fimc = video_drvdata(file);



	strlcpy(cap->driver, FIMC_LITE_DRV_NAME, sizeof(cap->driver));

	cap->bus_info[0] = 0;

	cap->card[0] = 0;

	cap->capabilities = V4L2_CAP_STREAMING;

	strlcpy(cap->card, FIMC_LITE_DRV_NAME, sizeof(cap->card));

	snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:%s",

					dev_name(&fimc->pdev->dev));



	cap->device_caps = V4L2_CAP_STREAMING;

	cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;

	return 0;

}
@@ -938,7 +943,7 @@ static int fimc_lite_s_selection(struct file *file, void *fh, 
}



static const struct v4l2_ioctl_ops fimc_lite_ioctl_ops = {

	.vidioc_querycap		= fimc_vidioc_querycap_capture,

	.vidioc_querycap		= fimc_lite_querycap,

	.vidioc_enum_fmt_vid_cap_mplane	= fimc_lite_enum_fmt_mplane,

	.vidioc_try_fmt_vid_cap_mplane	= fimc_lite_try_fmt_mplane,

	.vidioc_s_fmt_vid_cap_mplane	= fimc_lite_s_fmt_mplane,