With the Media Controller API various pipeline entities can be configured independently and in unpredictable order. The only location, where we know for sure, that the pipeline should be ready, is .vidioc_streamon(). This makes it the only suitable location for the bus parameter configuration. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx> --- drivers/media/video/soc_camera.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c index 5596688..2905a88 100644 --- a/drivers/media/video/soc_camera.c +++ b/drivers/media/video/soc_camera.c @@ -509,8 +509,7 @@ static int soc_camera_set_fmt(struct soc_camera_device *icd, dev_dbg(icd->pdev, "set width: %d height: %d\n", icd->user_width, icd->user_height); - /* set physical bus parameters */ - return ici->ops->set_bus_param(icd); + return 0; } static int soc_camera_open(struct file *file) @@ -814,6 +813,11 @@ static int soc_camera_streamon(struct file *file, void *priv, if (icd->streamer != file) return -EBUSY; + /* set physical bus parameters */ + ret = ici->ops->set_bus_param(icd); + if (ret < 0) + return ret; + /* This calls buf_queue from host driver's videobuf_queue_ops */ if (ici->ops->init_videobuf) ret = videobuf_streamon(&icd->vb_vidq); -- 1.7.2.5 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
