[PATCH 1/3] Platform: OLPC: Fix probe error handling

[Lubomir Rintel]

Reset ec_priv if probe ends unsuccessfully.

Signed-off-by: Lubomir Rintel <lkund...@v3.sk>
---
 drivers/platform/olpc/olpc-ec.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/platform/olpc/olpc-ec.c b/drivers/platform/olpc/olpc-ec.c
index f64b82824db28..2db7113383fdc 100644
--- 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;
@@ -440,12 +437,16 @@ static int olpc_ec_probe(struct platform_device *pdev)
        if (IS_ERR(ec->dcon_rdev)) {
                dev_err(&pdev->dev, "failed to register DCON regulator\n");
                err = PTR_ERR(ec->dcon_rdev);
-               kfree(ec);
-               return err;
+               goto error;
        }
 
        ec->dbgfs_dir = olpc_ec_setup_debugfs();
 
+       return 0;
+
+error:
+       ec_priv = NULL;
+       kfree(ec);
        return err;
 }
 
-- 
2.29.2