Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Lubomir Rintel <lkundrak@v3.sk>
To:     Liam Girdwood <lgirdwood@gmail.com>
Cc:     Mark Brown <broonie@kernel.org>, linux-kernel@vger.kernel.org,
        Lubomir Rintel <lkundrak@v3.sk>
Subject: [PATCH RFC 2/4] Platform: OLPC: Fix handling of regulator registration error
Date:   Tue,  1 Dec 2020 09:23:46 +0100
Message-Id: <20201201082348.1723631-3-lkundrak@v3.sk>
In-Reply-To: <20201201082348.1723631-1-lkundrak@v3.sk>
References: <20201201082348.1723631-1-lkundrak@v3.sk>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

We wouldn't reset ec_priv previously. Let's handle handle the errors in
a single spot to fix this.

Signed-off-by: Lubomir Rintel <lkundrak@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 faecb73bd8430..2ad638583cc58 100644
--- a/drivers/platform/olpc/olpc-ec.c
+++ b/drivers/platform/olpc/olpc-ec.c
@@ -427,11 +427,8 @@ static int olpc_ec_probe(struct platform_device *pde=
v)
=20
 	/* get the EC revision */
 	err =3D olpc_ec_cmd(EC_FIRMWARE_REV, NULL, 0, &ec->version, 1);
-	if (err) {
-		ec_priv =3D NULL;
-		kfree(ec);
-		return err;
-	}
+	if (err)
+		goto error;
=20
 	config.dev =3D pdev->dev.parent;
 	config.driver_data =3D ec;
@@ -441,12 +438,16 @@ static int olpc_ec_probe(struct platform_device *pd=
ev)
 	if (IS_ERR(ec->dcon_rdev)) {
 		dev_err(&pdev->dev, "failed to register DCON regulator\n");
 		err =3D PTR_ERR(ec->dcon_rdev);
-		kfree(ec);
-		return err;
+		goto error;
 	}
=20
 	ec->dbgfs_dir =3D olpc_ec_setup_debugfs();
=20
+	return 0;
+
+error:
+	ec_priv =3D NULL;
+	kfree(ec);
 	return err;
 }
=20
--=20
2.28.0