Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into for...

[cascardo/linux.git] / drivers / extcon / extcon-adc-jack.c

diff --git a/drivers/extcon/extcon-adc-jack.c b/drivers/extcon/extcon-adc-jack.c
index 768eaed..7fc0ae1 100644 (file)
--- 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) {