diff options
| author | Marek Szyprowski <m.szyprowski@samsung.com> | 2015-08-12 10:29:23 +0200 |
|---|---|---|
| committer | Seung-Woo Kim <sw0312.kim@samsung.com> | 2016-12-14 13:47:46 +0900 |
| commit | 689769f06dfbd5716beb70ea35f1b5011c9494b4 (patch) | |
| tree | 9f5cf045458bb5e80a563905188631379ac25895 /drivers/media | |
| parent | cfff17ac3db90b8d088101024a60acfe32b2a79c (diff) | |
fimc-is: fixup for v4.1 rebase
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/platform/exynos/fimc-is/fimc-is-core.c | 5 | ||||
| -rw-r--r-- | drivers/media/platform/exynos/fimc-is/fimc-is-video.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-core.c b/drivers/media/platform/exynos/fimc-is/fimc-is-core.c index 4e9402869361..d3cf95995320 100644 --- a/drivers/media/platform/exynos/fimc-is/fimc-is-core.c +++ b/drivers/media/platform/exynos/fimc-is/fimc-is-core.c @@ -882,9 +882,8 @@ static int fimc_is_probe(struct platform_device *pdev) /* detach default iommu domain and create our own one */ iommu_dma_detach_device(&pdev->dev); - dom = iommu_dma_create_domain( - (struct iommu_ops *)platform_bus_type.iommu_ops, - 0x10000000, 0x80000000); + dom = iommu_dma_create_domain(&platform_bus_type, 0x10000000, + 0x80000000); iommu_dma_attach_device(&pdev->dev, dom); /* init mutex for spi read */ diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-video.c b/drivers/media/platform/exynos/fimc-is/fimc-is-video.c index 191ef1668946..e18c01cec7ca 100644 --- a/drivers/media/platform/exynos/fimc-is/fimc-is-video.c +++ b/drivers/media/platform/exynos/fimc-is/fimc-is-video.c @@ -301,6 +301,7 @@ static int queue_init(void *priv, struct vb2_queue *vbq_src, vbq_src->ops = vctx->vb2_ops; vbq_src->mem_ops = vctx->mem_ops; vbq_src->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY; + vbq_src->allow_zero_bytesused = 1; ret = vb2_queue_init(vbq_src); if (ret) { @@ -334,6 +335,7 @@ static int queue_init(void *priv, struct vb2_queue *vbq_src, vbq_src->ops = vctx->vb2_ops; vbq_src->mem_ops = vctx->mem_ops; vbq_src->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY; + vbq_src->allow_zero_bytesused = 1; ret = vb2_queue_init(vbq_src); if (ret) { |