diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-01-29 11:41:18 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-01-29 11:41:18 +0300 |
| commit | 76b36fa896a2db64582690e085f36adc76604134 (patch) | |
| tree | 78007f123ead6f96cdee6ba98ac3c289c706cc39 /drivers/media/platform/exynos4-is/fimc-m2m.c | |
| parent | 14365449b6ce34cf6a3040ff8ebbb39d89d67159 (diff) | |
| parent | 92e963f50fc74041b5e9e744c330dca48e04f08d (diff) | |
| download | linux-76b36fa896a2db64582690e085f36adc76604134.tar.xz | |
Merge tag 'v4.5-rc1' into x86/asm, to refresh the branch before merging new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/media/platform/exynos4-is/fimc-m2m.c')
| -rw-r--r-- | drivers/media/platform/exynos4-is/fimc-m2m.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/platform/exynos4-is/fimc-m2m.c b/drivers/media/platform/exynos4-is/fimc-m2m.c index 4d1d64a46b21..55ec4c99d484 100644 --- a/drivers/media/platform/exynos4-is/fimc-m2m.c +++ b/drivers/media/platform/exynos4-is/fimc-m2m.c @@ -132,7 +132,7 @@ static void fimc_device_run(void *priv) if (ret) goto dma_unlock; - dst_vb->timestamp = src_vb->timestamp; + dst_vb->vb2_buf.timestamp = src_vb->vb2_buf.timestamp; dst_vb->flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK; dst_vb->flags |= src_vb->flags & V4L2_BUF_FLAG_TSTAMP_SRC_MASK; @@ -176,7 +176,7 @@ static void fimc_job_abort(void *priv) fimc_m2m_shutdown(priv); } -static int fimc_queue_setup(struct vb2_queue *vq, const void *parg, +static int fimc_queue_setup(struct vb2_queue *vq, unsigned int *num_buffers, unsigned int *num_planes, unsigned int sizes[], void *allocators[]) { @@ -739,7 +739,7 @@ int fimc_register_m2m_device(struct fimc_dev *fimc, return PTR_ERR(fimc->m2m.m2m_dev); } - ret = media_entity_init(&vfd->entity, 0, NULL, 0); + ret = media_entity_pads_init(&vfd->entity, 0, NULL); if (ret) goto err_me; |