X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=drivers%2Fextcon%2Fextcon-adc-jack.c;h=7fc0ae1912f855c586ef0a9b064ea3bba68ff3b6;hb=3dbbbe0eb6e949409d215f660cfad782aa541a4b;hp=768eaed66380031e79ea7b15037081c410bbfacf;hpb=c571bbb4b699cfd3af5b4c1027b04eb4290e6726;p=cascardo%2Flinux.git

diff --git a/drivers/extcon/extcon-adc-jack.c b/drivers/extcon/extcon-adc-jack.c
index 768eaed66380..7fc0ae1912f8 100644
--- a/drivers/extcon/extcon-adc-jack.c
+++ b/drivers/extcon/extcon-adc-jack.c
@@ -40,7 +40,7 @@
 struct adc_jack_data {
 	struct extcon_dev *edev;
 
-	const char **cable_names;
+	const unsigned int **cable_names;
 	struct adc_jack_cond *adc_conditions;
 	int num_conditions;
 
@@ -110,7 +110,6 @@ static int adc_jack_probe(struct platform_device *pdev)
 		dev_err(&pdev->dev, "failed to allocate extcon device\n");
 		return -ENOMEM;
 	}
-	data->edev->name = pdata->name;
 
 	if (!pdata->adc_conditions ||
 			!pdata->adc_conditions[0].state) {