From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Date: Thu, 12 Oct 2017 22:04:47 +0000 (+0200)
Subject: rtc: abx80x: solve race condition
X-Git-Tag: v4.15-rc1~24^2~34
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=9da32ba64d59d577297bf766a3f12753ebef5712;p=linux.git

rtc: abx80x: solve race condition

There is a race condition that can happen if abx80x_probe() fails after the
rtc registration succeeded. Solve that by moving the registration at the
end of the probe function.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---

diff --git a/drivers/rtc/rtc-abx80x.c b/drivers/rtc/rtc-abx80x.c
index 442e62a3c9a9..b033bc556f5d 100644
--- a/drivers/rtc/rtc-abx80x.c
+++ b/drivers/rtc/rtc-abx80x.c
@@ -620,10 +620,6 @@ static int abx80x_probe(struct i2c_client *client,
 
 	rtc->ops = &abx80x_rtc_ops;
 
-	err = rtc_register_device(rtc);
-	if (err)
-		return err;
-
 	i2c_set_clientdata(client, rtc);
 
 	if (client->irq > 0) {
@@ -650,10 +646,14 @@ static int abx80x_probe(struct i2c_client *client,
 	err = devm_add_action_or_reset(&client->dev,
 				       rtc_calib_remove_sysfs_group,
 				       &client->dev);
-	if (err)
+	if (err) {
 		dev_err(&client->dev,
 			"Failed to add sysfs cleanup action: %d\n",
 			err);
+		return err;
+	}
+
+	err = rtc_register_device(rtc);
 
 	return err;
 }