diff --git a/[refs] b/[refs] index 9fa1c273d57a..0bcb9cb2957b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 73dad42e68ae580cdf0a5c5bd5347027e0881194 +refs/heads/master: dc6341c4a49d6c146d2811b1a823ec1659767c6c diff --git a/trunk/drivers/media/platform/s5p-jpeg/jpeg-core.c b/trunk/drivers/media/platform/s5p-jpeg/jpeg-core.c index 72c3e525f921..90459cefb2b8 100644 --- a/trunk/drivers/media/platform/s5p-jpeg/jpeg-core.c +++ b/trunk/drivers/media/platform/s5p-jpeg/jpeg-core.c @@ -1223,7 +1223,6 @@ static int queue_init(void *priv, struct vb2_queue *src_vq, struct s5p_jpeg_ctx *ctx = priv; int ret; - memset(src_vq, 0, sizeof(*src_vq)); src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT; src_vq->io_modes = VB2_MMAP | VB2_USERPTR; src_vq->drv_priv = ctx; @@ -1235,7 +1234,6 @@ static int queue_init(void *priv, struct vb2_queue *src_vq, if (ret) return ret; - memset(dst_vq, 0, sizeof(*dst_vq)); dst_vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; dst_vq->io_modes = VB2_MMAP | VB2_USERPTR; dst_vq->drv_priv = ctx;