From: Greg Kroah-Hartman Date: Wed, 19 May 2021 14:52:24 +0000 (+0200) Subject: 4.9-stable patches X-Git-Tag: v4.4.269~33 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c2b328bc38dc09d7d84ea5afe84840cee3d876db;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 00000000000..ca970660273 --- /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 +Date: Sun, 27 Nov 2016 21:37:20 -0500 +Subject: extcon: adc-jack: Fix incompatible pointer type warning + +From: Peter Foley + +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 +[cw00.choi: Modify the patch title and descritpion] +Signed-off-by: Chanwoo Choi +Signed-off-by: Greg Kroah-Hartman +--- + 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 f609739d4c9..3b2252411cc 100644 --- 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