From: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Date: Wed, 5 Dec 2018 18:16:24 +0000 (-0500)
Subject: Merge commit '0072a0c14d5b7cb72c611d396f143f5dcd73ebe2' into patchwork
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=14a4467a0a5eacb2ebbe3aab1b4e25af3519c76a;p=linux.git

Merge commit '0072a0c14d5b7cb72c611d396f143f5dcd73ebe2' into patchwork

Merge from Upstream after the latest media fixes branch, because we
need one patch that it is there.

* commit '0072a0c14d5b7cb72c611d396f143f5dcd73ebe2': (1108 commits)
  ide: Change to use DEFINE_SHOW_ATTRIBUTE macro
  ide: pmac: add of_node_put()
  drivers/tty: add missing of_node_put()
  drivers/sbus/char: add of_node_put()
  sbus: char: add of_node_put()
  Linux 4.20-rc5
  PCI: Fix incorrect value returned from pcie_get_speed_cap()
  MAINTAINERS: Update linux-mips mailing list address
  ocfs2: fix potential use after free
  mm/khugepaged: fix the xas_create_range() error path
  mm/khugepaged: collapse_shmem() do not crash on Compound
  mm/khugepaged: collapse_shmem() without freezing new_page
  mm/khugepaged: minor reorderings in collapse_shmem()
  mm/khugepaged: collapse_shmem() remember to clear holes
  mm/khugepaged: fix crashes due to misaccounted holes
  mm/khugepaged: collapse_shmem() stop if punched or truncated
  mm/huge_memory: fix lockdep complaint on 32-bit i_size_read()
  mm/huge_memory: splitting set mapping+index before unfreeze
  mm/huge_memory: rename freeze_page() to unmap_page()
  initramfs: clean old path before creating a hardlink
  ...
---

14a4467a0a5eacb2ebbe3aab1b4e25af3519c76a
diff --cc drivers/media/platform/vicodec/vicodec-core.c
index 78c6009a53c34,013cdebecbc49..2b7daff634257
--- a/drivers/media/platform/vicodec/vicodec-core.c
+++ b/drivers/media/platform/vicodec/vicodec-core.c
@@@ -301,10 -301,11 +301,11 @@@ restart
  
  	if (!ctx->comp_size) {
  		state = VB2_BUF_STATE_ERROR;
 -		for (; p < p_out + sz; p++) {
 +		for (; p < p_src + sz; p++) {
  			u32 copy;
  
- 			p = memchr(p, magic[ctx->comp_magic_cnt], sz);
+ 			p = memchr(p, magic[ctx->comp_magic_cnt],
 -				   p_out + sz - p);
++				   p_src + sz - p);
  			if (!p) {
  				ctx->comp_magic_cnt = 0;
  				break;