From: Peter Foley <pefoley2@pefoley.com>
Date: Mon, 28 Nov 2016 02:37:20 +0000 (-0500)
Subject: extcon: adc-jack: Fix incompatible pointer type warning
X-Git-Tag: v4.9.269~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cb7d2be7f239e8c42bc850dd39c736118bb2ce00;p=thirdparty%2Fkernel%2Fstable.git

extcon: adc-jack: Fix incompatible pointer type warning

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>
---

diff --git a/include/linux/extcon/extcon-adc-jack.h b/include/linux/extcon/extcon-adc-jack.h
index a0e03b13b449d..2aa32075bca15 100644
--- 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;