From: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Date: Tue, 21 Apr 2015 09:12:35 +0000 (-0300)
Subject: Merge branch 'patchwork' into v4l_for_linus
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=676ee36be04985062522804c2de04f0764212be6;p=linux-beck.git

Merge branch 'patchwork' into v4l_for_linus

* patchwork: (404 commits)
  [media] uvcvideo: add support for VIDIOC_QUERY_EXT_CTRL
  [media] uvcvideo: fix cropcap v4l2-compliance failure
  [media] media: omap3isp: remove unused clkdev
  [media] coda: Add tracing support
  [media] coda: drop dma_sync_single_for_device in coda_bitstream_queue
  [media] coda: fix fill bitstream errors in nonstreaming case
  [media] coda: call SEQ_END when the first queue is stopped
  [media] coda: fail to start streaming if userspace set invalid formats
  [media] coda: remove duplicate error messages for buffer allocations
  [media] coda: move parameter buffer in together with context buffer allocation
  [media] coda: allocate bitstream buffer from REQBUFS, size depends on the format
  [media] coda: allocate per-context buffers from REQBUFS
  [media] coda: use strlcpy instead of snprintf
  [media] coda: bitstream payload is unsigned
  [media] coda: fix double call to debugfs_remove
  [media] coda: check kasprintf return value in coda_open
  [media] coda: bitrate can only be set in kbps steps
  [media] v4l2-mem2mem: no need to initialize b in v4l2_m2m_next_buf and v4l2_m2m_buf_remove
  [media] s5p-mfc: set allow_zero_bytesused flag for vb2_queue_init
  [media] coda: set allow_zero_bytesused flag for vb2_queue_init
  ...
---

676ee36be04985062522804c2de04f0764212be6
diff --cc drivers/media/platform/s5p-jpeg/jpeg-core.c
index a92ff4249d10,697dc0e1945d..bfbf1575677c
--- a/drivers/media/platform/s5p-jpeg/jpeg-core.c
+++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c
@@@ -1842,12 -1844,9 +1844,12 @@@ static void exynos4_jpeg_set_img_addr(s
  	struct s5p_jpeg *jpeg = ctx->jpeg;
  	struct s5p_jpeg_fmt *fmt;
  	struct vb2_buffer *vb;
- 	struct s5p_jpeg_addr jpeg_addr;
+ 	struct s5p_jpeg_addr jpeg_addr = {};
  	u32 pix_size, padding_bytes = 0;
  
 +	jpeg_addr.cb = 0;
 +	jpeg_addr.cr = 0;
 +
  	pix_size = ctx->cap_q.w * ctx->cap_q.h;
  
  	if (ctx->mode == S5P_JPEG_ENCODE) {