Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / extcon / extcon-max8997.c

diff --git a/drivers/extcon/extcon-max8997.c b/drivers/extcon/extcon-max8997.c
index 804a446fecdc8bdf9e66753c7afd10eb1a189d43..d9f7f1baaa030f50e8568caa7724194dbc8ea854 100644 (file)
--- a/drivers/extcon/extcon-max8997.c
+++ b/drivers/extcon/extcon-max8997.c
@@ -699,16 +699,15 @@ static int max8997_muic_probe(struct platform_device *pdev)
        }
 
        /* External connector */
-       info->edev = devm_kzalloc(&pdev->dev, sizeof(struct extcon_dev),
-                                 GFP_KERNEL);
-       if (!info->edev) {
+       info->edev = devm_extcon_dev_allocate(&pdev->dev, max8997_extcon_cable);
+       if (IS_ERR(info->edev)) {
                dev_err(&pdev->dev, "failed to allocate memory for extcon\n");
                ret = -ENOMEM;
                goto err_irq;
        }
        info->edev->name = DEV_NAME;
        info->edev->dev.parent = &pdev->dev;
-       info->edev->supported_cable = max8997_extcon_cable;
+
        ret = devm_extcon_dev_register(&pdev->dev, info->edev);
        if (ret) {
                dev_err(&pdev->dev, "failed to register extcon device\n");