KVM: vmx: VMXOFF emulation in vm86 should cause #UD

[sfrench/cifs-2.6.git] / drivers / extcon / extcon-max77693.c

diff --git a/drivers/extcon/extcon-max77693.c b/drivers/extcon/extcon-max77693.c
index c7278b1649da9f743814434cfe017e69e4189d00..77460f2c1ca1602ed3a6948c56d9389e0c508a4f 100644 (file)
--- a/drivers/extcon/extcon-max77693.c
+++ b/drivers/extcon/extcon-max77693.c
@@ -1099,10 +1099,9 @@ static int max77693_muic_probe(struct platform_device *pdev)
 
        info = devm_kzalloc(&pdev->dev, sizeof(struct max77693_muic_info),
                                   GFP_KERNEL);
-       if (!info) {
-               dev_err(&pdev->dev, "failed to allocate memory\n");
+       if (!info)
                return -ENOMEM;
-       }
+
        info->dev = &pdev->dev;
        info->max77693 = max77693;
        if (info->max77693->regmap_muic) {
@@ -1184,7 +1183,6 @@ static int max77693_muic_probe(struct platform_device *pdev)
                goto err_irq;
        }
        info->edev->name = DEV_NAME;
-       info->edev->dev.parent = &pdev->dev;
 
        ret = devm_extcon_dev_register(&pdev->dev, info->edev);
        if (ret) {