Fixes for 4.9

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.9/input-raydium_i2c_ts-fix-error-codes-in-raydium_i2c_.patch b/queue-4.9/input-raydium_i2c_ts-fix-error-codes-in-raydium_i2c_.patch
new file mode 100644 (file)
index 0000000..7a95fcd
--- /dev/null
+++ b/queue-4.9/input-raydium_i2c_ts-fix-error-codes-in-raydium_i2c_.patch
@@ -0,0 +1,61 @@
+From 56d351162cf5e2b560bb894aede6cee0774cebc3 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Fri, 6 Mar 2020 11:50:51 -0800
+Subject: Input: raydium_i2c_ts - fix error codes in raydium_i2c_boot_trigger()
+
+From: Dan Carpenter <dan.carpenter@oracle.com>
+
+[ Upstream commit 32cf3a610c35cb21e3157f4bbf29d89960e30a36 ]
+
+These functions are supposed to return negative error codes but instead
+it returns true on failure and false on success.  The error codes are
+eventually propagated back to user space.
+
+Fixes: 48a2b783483b ("Input: add Raydium I2C touchscreen driver")
+Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
+Link: https://lore.kernel.org/r/20200303101306.4potflz7na2nn3od@kili.mountain
+Cc: stable@vger.kernel.org
+Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/input/touchscreen/raydium_i2c_ts.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/input/touchscreen/raydium_i2c_ts.c b/drivers/input/touchscreen/raydium_i2c_ts.c
+index 76cdc145c0912..1f5b6b5b1018a 100644
+--- a/drivers/input/touchscreen/raydium_i2c_ts.c
++++ b/drivers/input/touchscreen/raydium_i2c_ts.c
+@@ -441,7 +441,7 @@ static int raydium_i2c_write_object(struct i2c_client *client,
+       return 0;
+ }
+ 
+-static bool raydium_i2c_boot_trigger(struct i2c_client *client)
++static int raydium_i2c_boot_trigger(struct i2c_client *client)
+ {
+       static const u8 cmd[7][6] = {
+               { 0x08, 0x0C, 0x09, 0x00, 0x50, 0xD7 },
+@@ -466,10 +466,10 @@ static bool raydium_i2c_boot_trigger(struct i2c_client *client)
+               }
+       }
+ 
+-      return false;
++      return 0;
+ }
+ 
+-static bool raydium_i2c_fw_trigger(struct i2c_client *client)
++static int raydium_i2c_fw_trigger(struct i2c_client *client)
+ {
+       static const u8 cmd[5][11] = {
+               { 0, 0x09, 0x71, 0x0C, 0x09, 0x00, 0x50, 0xD7, 0, 0, 0 },
+@@ -492,7 +492,7 @@ static bool raydium_i2c_fw_trigger(struct i2c_client *client)
+               }
+       }
+ 
+-      return false;
++      return 0;
+ }
+ 
+ static int raydium_i2c_check_path(struct i2c_client *client)
+-- 
+2.20.1
+

diff --git a/queue-4.9/input-raydium_i2c_ts-use-true-and-false-for-boolean-.patch b/queue-4.9/input-raydium_i2c_ts-use-true-and-false-for-boolean-.patch
new file mode 100644 (file)
index 0000000..bf11855
--- /dev/null
+++ b/queue-4.9/input-raydium_i2c_ts-use-true-and-false-for-boolean-.patch
@@ -0,0 +1,46 @@
+From fe21619633a1ad84cb79f675107ac85194de3eea Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Mon, 6 Aug 2018 15:20:19 -0700
+Subject: Input: raydium_i2c_ts - use true and false for boolean values
+
+From: Gustavo A. R. Silva <gustavo@embeddedor.com>
+
+[ Upstream commit 6cad4e269e25dddd7260a53e9d9d90ba3a3cc35a ]
+
+Return statements in functions returning bool should use true or false
+instead of an integer value.
+
+This code was detected with the help of Coccinelle.
+
+Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
+Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/input/touchscreen/raydium_i2c_ts.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/input/touchscreen/raydium_i2c_ts.c b/drivers/input/touchscreen/raydium_i2c_ts.c
+index a99fb5cac5a0e..76cdc145c0912 100644
+--- a/drivers/input/touchscreen/raydium_i2c_ts.c
++++ b/drivers/input/touchscreen/raydium_i2c_ts.c
+@@ -466,7 +466,7 @@ static bool raydium_i2c_boot_trigger(struct i2c_client *client)
+               }
+       }
+ 
+-      return 0;
++      return false;
+ }
+ 
+ static bool raydium_i2c_fw_trigger(struct i2c_client *client)
+@@ -492,7 +492,7 @@ static bool raydium_i2c_fw_trigger(struct i2c_client *client)
+               }
+       }
+ 
+-      return 0;
++      return false;
+ }
+ 
+ static int raydium_i2c_check_path(struct i2c_client *client)
+-- 
+2.20.1
+

diff --git a/queue-4.9/series b/queue-4.9/series
index 00bd23085b095ad857800cc552be29a6ff3abaa6..5a8647af4ffc42e2128c027bc01b7acaabf4a568 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -68,3 +68,6 @@ xfrm-add-the-missing-verify_sec_ctx_len-check-in-xfrm_add_acquire.patch
 xfrm-policy-fix-doulbe-free-in-xfrm_policy_timer.patch
 netfilter-nft_fwd_netdev-validate-family-and-chain-type.patch
 vti6-fix-memory-leak-of-skb-if-input-policy-check-fails.patch
+input-raydium_i2c_ts-use-true-and-false-for-boolean-.patch
+input-raydium_i2c_ts-fix-error-codes-in-raydium_i2c_.patch
+tools-let-o-makes-handle-a-relative-path-with-c-opti.patch

diff --git a/queue-4.9/tools-let-o-makes-handle-a-relative-path-with-c-opti.patch b/queue-4.9/tools-let-o-makes-handle-a-relative-path-with-c-opti.patch
new file mode 100644 (file)
index 0000000..214ba39
--- /dev/null
+++ b/queue-4.9/tools-let-o-makes-handle-a-relative-path-with-c-opti.patch
@@ -0,0 +1,77 @@
+From 5e7cc5787d4558275d01a1be84e92bea641f4882 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Sat, 7 Mar 2020 03:32:58 +0900
+Subject: tools: Let O= makes handle a relative path with -C option
+
+From: Masami Hiramatsu <mhiramat@kernel.org>
+
+[ Upstream commit be40920fbf1003c38ccdc02b571e01a75d890c82 ]
+
+When I tried to compile tools/perf from the top directory with the -C
+option, the O= option didn't work correctly if I passed a relative path:
+
+  $ make O=BUILD -C tools/perf/
+  make: Entering directory '/home/mhiramat/ksrc/linux/tools/perf'
+    BUILD:   Doing 'make -j8' parallel build
+  ../scripts/Makefile.include:4: *** O=/home/mhiramat/ksrc/linux/tools/perf/BUILD does not exist.  Stop.
+  make: *** [Makefile:70: all] Error 2
+  make: Leaving directory '/home/mhiramat/ksrc/linux/tools/perf'
+
+The O= directory existence check failed because the check script ran in
+the build target directory instead of the directory where I ran the make
+command.
+
+To fix that, once change directory to $(PWD) and check O= directory,
+since the PWD is set to where the make command runs.
+
+Fixes: c883122acc0d ("perf tools: Let O= makes handle relative paths")
+Reported-by: Randy Dunlap <rdunlap@infradead.org>
+Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
+Cc: Andrew Morton <akpm@linux-foundation.org>
+Cc: Borislav Petkov <bp@alien8.de>
+Cc: Geert Uytterhoeven <geert@linux-m68k.org>
+Cc: Jiri Olsa <jolsa@redhat.com>
+Cc: Masahiro Yamada <masahiroy@kernel.org>
+Cc: Michal Marek <michal.lkml@markovi.net>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Sasha Levin <sashal@kernel.org>
+Cc: Steven Rostedt (VMware) <rostedt@goodmis.org>
+Cc: stable@vger.kernel.org
+Link: http://lore.kernel.org/lkml/158351957799.3363.15269768530697526765.stgit@devnote2
+Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ tools/perf/Makefile            | 2 +-
+ tools/scripts/Makefile.include | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tools/perf/Makefile b/tools/perf/Makefile
+index cd86fd7b35c48..ebcc0868b99ea 100644
+--- a/tools/perf/Makefile
++++ b/tools/perf/Makefile
+@@ -34,7 +34,7 @@ endif
+ # Only pass canonical directory names as the output directory:
+ #
+ ifneq ($(O),)
+-  FULL_O := $(shell readlink -f $(O) || echo $(O))
++  FULL_O := $(shell cd $(PWD); readlink -f $(O) || echo $(O))
+ endif
+ 
+ #
+diff --git a/tools/scripts/Makefile.include b/tools/scripts/Makefile.include
+index 7ea4438b801dd..882c18201c7c3 100644
+--- a/tools/scripts/Makefile.include
++++ b/tools/scripts/Makefile.include
+@@ -1,7 +1,7 @@
+ ifneq ($(O),)
+ ifeq ($(origin O), command line)
+-      dummy := $(if $(shell test -d $(O) || echo $(O)),$(error O=$(O) does not exist),)
+-      ABSOLUTE_O := $(shell cd $(O) ; pwd)
++      dummy := $(if $(shell cd $(PWD); test -d $(O) || echo $(O)),$(error O=$(O) does not exist),)
++      ABSOLUTE_O := $(shell cd $(PWD); cd $(O) ; pwd)
+       OUTPUT := $(ABSOLUTE_O)/$(if $(subdir),$(subdir)/)
+       COMMAND_O := O=$(ABSOLUTE_O)
+ ifeq ($(objtree),)
+-- 
+2.20.1
+