4.9-stable patches

added patches:
	extcon-adc-jack-fix-incompatible-pointer-type-warning.patch

diff --git a/queue-4.9/extcon-adc-jack-fix-incompatible-pointer-type-warning.patch b/queue-4.9/extcon-adc-jack-fix-incompatible-pointer-type-warning.patch
new file mode 100644 (file)
index 0000000..ca97066
--- /dev/null
+++ b/queue-4.9/extcon-adc-jack-fix-incompatible-pointer-type-warning.patch
@@ -0,0 +1,31 @@
+From 8a522bf2d4f788306443d36b26b54f0aedcdfdbe Mon Sep 17 00:00:00 2001
+From: Peter Foley <pefoley2@pefoley.com>
+Date: Sun, 27 Nov 2016 21:37:20 -0500
+Subject: extcon: adc-jack: Fix incompatible pointer type warning
+
+From: Peter Foley <pefoley2@pefoley.com>
+
+commit 8a522bf2d4f788306443d36b26b54f0aedcdfdbe upstream.
+
+This patch fixes the incompatible warning of extcon-adc-jack.c driver
+when calling devm_extcon_dev_allocate().
+
+Signed-off-by: Peter Foley <pefoley2@pefoley.com>
+[cw00.choi: Modify the patch title and descritpion]
+Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ include/linux/extcon/extcon-adc-jack.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/include/linux/extcon/extcon-adc-jack.h
++++ b/include/linux/extcon/extcon-adc-jack.h
+@@ -59,7 +59,7 @@ struct adc_jack_pdata {
+       const char *name;
+       const char *consumer_channel;
+ 
+-      const enum extcon *cable_names;
++      const unsigned int *cable_names;
+ 
+       /* The last entry's state should be 0 */
+       struct adc_jack_cond *adc_conditions;

diff --git a/queue-4.9/series b/queue-4.9/series
index f609739d4c9f0007bc20e073b7d045b3ec0b8197..3b2252411ccec154ade13534a3f7201f5c235665 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -222,3 +222,4 @@ kobject_uevent-remove-warning-in-init_uevent_argv.patch
 netfilter-conntrack-make-global-sysctls-readonly-in-non-init-netns.patch
 clk-exynos7-mark-aclk_fsys1_200-as-critical.patch
 x86-msr-fix-wr-rdmsr_safe_regs_on_cpu-prototypes.patch
+extcon-adc-jack-fix-incompatible-pointer-type-warning.patch