Platform: OLPC: Fix probe error handling

[mirror_ubuntu-focal-kernel.git] / drivers / platform / olpc / olpc-ec.c

diff --git a/drivers/platform/olpc/olpc-ec.c b/drivers/platform/olpc/olpc-ec.c
index 190e4a6186ef7ffe7a93754e54c9cda38b51f646..2db7113383fdc7dbe75183c9a8673e7be8400884 100644 (file)
--- a/drivers/platform/olpc/olpc-ec.c
+++ b/drivers/platform/olpc/olpc-ec.c
@@ -426,11 +426,8 @@ static int olpc_ec_probe(struct platform_device *pdev)
 
        /* get the EC revision */
        err = olpc_ec_cmd(EC_FIRMWARE_REV, NULL, 0, &ec->version, 1);
-       if (err) {
-               ec_priv = NULL;
-               kfree(ec);
-               return err;
-       }
+       if (err)
+               goto error;
 
        config.dev = pdev->dev.parent;
        config.driver_data = ec;
@@ -439,11 +436,17 @@ static int olpc_ec_probe(struct platform_device *pdev)
                                                                &config);
        if (IS_ERR(ec->dcon_rdev)) {
                dev_err(&pdev->dev, "failed to register DCON regulator\n");
-               return PTR_ERR(ec->dcon_rdev);
+               err = PTR_ERR(ec->dcon_rdev);
+               goto error;
        }
 
        ec->dbgfs_dir = olpc_ec_setup_debugfs();
 
+       return 0;
+
+error:
+       ec_priv = NULL;
+       kfree(ec);
        return err;
 }