diff options
Diffstat (limited to 'drivers/media/platform/exynos4-is/fimc-isp-video.c')
-rw-r--r-- | drivers/media/platform/exynos4-is/fimc-isp-video.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/media/platform/exynos4-is/fimc-isp-video.c b/drivers/media/platform/exynos4-is/fimc-isp-video.c index 93f9cf2ebcd6..76b6b4d14616 100644 --- a/drivers/media/platform/exynos4-is/fimc-isp-video.c +++ b/drivers/media/platform/exynos4-is/fimc-isp-video.c | |||
@@ -219,9 +219,9 @@ static void isp_video_capture_buffer_queue(struct vb2_buffer *vb) | |||
219 | ivb->dma_addr[i]; | 219 | ivb->dma_addr[i]; |
220 | 220 | ||
221 | isp_dbg(2, &video->ve.vdev, | 221 | isp_dbg(2, &video->ve.vdev, |
222 | "dma_buf %d (%d/%d/%d) addr: %#x\n", | 222 | "dma_buf %pad (%d/%d/%d) addr: %pad\n", |
223 | buf_index, ivb->index, i, vb->v4l2_buf.index, | 223 | &buf_index, ivb->index, i, vb->v4l2_buf.index, |
224 | ivb->dma_addr[i]); | 224 | &ivb->dma_addr[i]); |
225 | } | 225 | } |
226 | 226 | ||
227 | if (++video->buf_count < video->reqbufs_count) | 227 | if (++video->buf_count < video->reqbufs_count) |
@@ -313,7 +313,6 @@ static int isp_video_release(struct file *file) | |||
313 | struct fimc_is_video *ivc = &isp->video_capture; | 313 | struct fimc_is_video *ivc = &isp->video_capture; |
314 | struct media_entity *entity = &ivc->ve.vdev.entity; | 314 | struct media_entity *entity = &ivc->ve.vdev.entity; |
315 | struct media_device *mdev = entity->parent; | 315 | struct media_device *mdev = entity->parent; |
316 | int ret = 0; | ||
317 | 316 | ||
318 | mutex_lock(&isp->video_lock); | 317 | mutex_lock(&isp->video_lock); |
319 | 318 | ||
@@ -335,7 +334,7 @@ static int isp_video_release(struct file *file) | |||
335 | pm_runtime_put(&isp->pdev->dev); | 334 | pm_runtime_put(&isp->pdev->dev); |
336 | mutex_unlock(&isp->video_lock); | 335 | mutex_unlock(&isp->video_lock); |
337 | 336 | ||
338 | return ret; | 337 | return 0; |
339 | } | 338 | } |
340 | 339 | ||
341 | static const struct v4l2_file_operations isp_video_fops = { | 340 | static const struct v4l2_file_operations isp_video_fops = { |