From dcd94896b66e13922757768cbdb80f4dc5b060f7 Mon Sep 17 00:00:00 2001 From: Sylwester Nawrocki Date: Thu, 18 Apr 2013 08:49:54 -0300 Subject: [PATCH] --- yaml --- r: 367092 b: refs/heads/master c: 5a66561f426d4a10bce077ba90ab127e6a27ac3d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/exynos4-is/fimc-capture.c | 2 +- trunk/drivers/media/platform/exynos4-is/fimc-isp.c | 2 +- trunk/drivers/media/platform/exynos4-is/fimc-lite.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 771b9ba573e6..6dd3a1488051 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 861a51fd40757b7a0912a103e5014366621be6e7 +refs/heads/master: 5a66561f426d4a10bce077ba90ab127e6a27ac3d diff --git a/trunk/drivers/media/platform/exynos4-is/fimc-capture.c b/trunk/drivers/media/platform/exynos4-is/fimc-capture.c index 72c516af40f6..558c528d9ce1 100644 --- a/trunk/drivers/media/platform/exynos4-is/fimc-capture.c +++ b/trunk/drivers/media/platform/exynos4-is/fimc-capture.c @@ -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; diff --git a/trunk/drivers/media/platform/exynos4-is/fimc-isp.c b/trunk/drivers/media/platform/exynos4-is/fimc-isp.c index 3b9a6642a491..d63947f7b302 100644 --- a/trunk/drivers/media/platform/exynos4-is/fimc-isp.c +++ b/trunk/drivers/media/platform/exynos4-is/fimc-isp.c @@ -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; diff --git a/trunk/drivers/media/platform/exynos4-is/fimc-lite.c b/trunk/drivers/media/platform/exynos4-is/fimc-lite.c index 661d0d148cb5..7ecf4e7ff5fc 100644 --- a/trunk/drivers/media/platform/exynos4-is/fimc-lite.c +++ b/trunk/drivers/media/platform/exynos4-is/fimc-lite.c @@ -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;