projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
drivers
/
media
/
platform
/
s5p-tv
/
mixer_video.c
diff --git
a/drivers/media/platform/s5p-tv/mixer_video.c
b/drivers/media/platform/s5p-tv/mixer_video.c
index
c5059ba
..
a1ce55f
100644
(file)
--- a/
drivers/media/platform/s5p-tv/mixer_video.c
+++ b/
drivers/media/platform/s5p-tv/mixer_video.c
@@
-946,11
+946,6
@@
static int start_streaming(struct vb2_queue *vq, unsigned int count)
mxr_dbg(mdev, "%s\n", __func__);
mxr_dbg(mdev, "%s\n", __func__);
- if (count == 0) {
- mxr_dbg(mdev, "no output buffers queued\n");
- return -ENOBUFS;
- }
-
/* block any changes in output configuration */
mxr_output_get(mdev);
/* block any changes in output configuration */
mxr_output_get(mdev);
@@
-1124,6
+1119,7
@@
struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
.drv_priv = layer,
.buf_struct_size = sizeof(struct mxr_buffer),
.ops = &mxr_video_qops,
.drv_priv = layer,
.buf_struct_size = sizeof(struct mxr_buffer),
.ops = &mxr_video_qops,
+ .min_buffers_needed = 1,
.mem_ops = &vb2_dma_contig_memops,
};
.mem_ops = &vb2_dma_contig_memops,
};