From eb682ff50f31976e848d77e56759a457af214f7a Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Mon, 22 Aug 2011 12:35:09 -0300 Subject: [PATCH] --- yaml --- r: 273675 b: refs/heads/master c: 6ac939c06f34eaba2bc4b3be1d7f6bf26f629a23 h: refs/heads/master i: 273673: 67e5f3618195b45f1f80e14baa93b7d1bc55749f 273671: 2e537c3d280288afa125da7a8585c7c6d323abd9 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/sh_mobile_ceu_camera.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 58a2e42846bd..bf873006b5a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 377c9ba772b0c3f848c12810231eb103aad473eb +refs/heads/master: 6ac939c06f34eaba2bc4b3be1d7f6bf26f629a23 diff --git a/trunk/drivers/media/video/sh_mobile_ceu_camera.c b/trunk/drivers/media/video/sh_mobile_ceu_camera.c index 59101c0be869..5c8ddd821df6 100644 --- a/trunk/drivers/media/video/sh_mobile_ceu_camera.c +++ b/trunk/drivers/media/video/sh_mobile_ceu_camera.c @@ -717,10 +717,13 @@ static void capture_restore(struct sh_mobile_ceu_dev *pcdev, u32 capsr) static struct v4l2_subdev *find_bus_subdev(struct sh_mobile_ceu_dev *pcdev, struct soc_camera_device *icd) { - if (!pcdev->csi2_pdev) - return soc_camera_to_subdev(icd); + if (pcdev->csi2_pdev) { + struct v4l2_subdev *csi2_sd = find_csi2(pcdev); + if (csi2_sd && csi2_sd->grp_id == (u32)icd) + return csi2_sd; + } - return find_csi2(pcdev); + return soc_camera_to_subdev(icd); } #define CEU_BUS_FLAGS (V4L2_MBUS_MASTER | \