Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a66561f authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mauro Carvalho Chehab
Browse files

[media] exynos4-is: Fix initialization of subdev 'flags' field 



Ensure the value of struct v4l2_subdev::flags field as set
in v4l2_subdev_init() is preserved when initializing it in
the subdev drivers.

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 861a51fd

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

+1 −1
Original line number Diff line number Diff line
@@ -1869,7 +1869,7 @@ int fimc_initialize_capture_subdev(struct fimc_dev *fimc) 
	int ret;



	v4l2_subdev_init(sd, &fimc_subdev_ops);

	sd->flags = V4L2_SUBDEV_FL_HAS_DEVNODE;

	sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;

	snprintf(sd->name, sizeof(sd->name), "FIMC.%d", fimc->id);



	fimc->vid_cap.sd_pads[FIMC_SD_PAD_SINK_CAM].flags = MEDIA_PAD_FL_SINK;

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

+1 −1
Original line number Diff line number Diff line
@@ -621,7 +621,7 @@ int fimc_isp_subdev_create(struct fimc_isp *isp) 


	v4l2_subdev_init(sd, &fimc_is_subdev_ops);

	sd->grp_id = GRP_ID_FIMC_IS;

	sd->flags = V4L2_SUBDEV_FL_HAS_DEVNODE;

	sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;

	snprintf(sd->name, sizeof(sd->name), "FIMC-IS-ISP");



	isp->subdev_pads[FIMC_ISP_SD_PAD_SINK].flags = MEDIA_PAD_FL_SINK;

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

+1 −1
Original line number Diff line number Diff line
@@ -1377,7 +1377,7 @@ static int fimc_lite_create_capture_subdev(struct fimc_lite *fimc) 
	int ret;



	v4l2_subdev_init(sd, &fimc_lite_subdev_ops);

	sd->flags = V4L2_SUBDEV_FL_HAS_DEVNODE;

	sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;

	snprintf(sd->name, sizeof(sd->name), "FIMC-LITE.%d", fimc->index);



	fimc->subdev_pads[FLITE_SD_PAD_SINK].flags = MEDIA_PAD_FL_SINK;