diff options
author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-09-11 10:10:24 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2013-11-29 08:45:34 -0500 |
commit | b317828beec632791a440a677de5116ab9bd900a (patch) | |
tree | dc490e15f2f8d3cbdf661e4813c40a2777f8d6e6 /drivers/media/platform/vsp1 | |
parent | 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae (diff) |
[media] v4l: vsp1: Fix error return code in vsp1_video_init()
Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/platform/vsp1')
-rw-r--r-- | drivers/media/platform/vsp1/vsp1_video.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/platform/vsp1/vsp1_video.c b/drivers/media/platform/vsp1/vsp1_video.c index 714c53ef6c11..4b0ac07af662 100644 --- a/drivers/media/platform/vsp1/vsp1_video.c +++ b/drivers/media/platform/vsp1/vsp1_video.c | |||
@@ -1026,8 +1026,10 @@ int vsp1_video_init(struct vsp1_video *video, struct vsp1_entity *rwpf) | |||
1026 | 1026 | ||
1027 | /* ... and the buffers queue... */ | 1027 | /* ... and the buffers queue... */ |
1028 | video->alloc_ctx = vb2_dma_contig_init_ctx(video->vsp1->dev); | 1028 | video->alloc_ctx = vb2_dma_contig_init_ctx(video->vsp1->dev); |
1029 | if (IS_ERR(video->alloc_ctx)) | 1029 | if (IS_ERR(video->alloc_ctx)) { |
1030 | ret = PTR_ERR(video->alloc_ctx); | ||
1030 | goto error; | 1031 | goto error; |
1032 | } | ||
1031 | 1033 | ||
1032 | video->queue.type = video->type; | 1034 | video->queue.type = video->type; |
1033 | video->queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF; | 1035 | video->queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF; |