summaryrefslogtreecommitdiffstats
path: root/drivers/rtc
diff options
context:
space:
mode:
authorGregory Hermant <gregory.hermant@calao-systems.com>2014-04-03 14:50:17 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-04-03 16:21:24 -0700
commit67ab2440b40610b3b91068844640df6d3de3464f (patch)
treeb8f1caccb6e01ce33557b63c1615883f0ea985f7 /drivers/rtc
parent617b26a0e1cf8f183328763b6f1a33a422b60614 (diff)
downloadop-kernel-dev-67ab2440b40610b3b91068844640df6d3de3464f.zip
op-kernel-dev-67ab2440b40610b3b91068844640df6d3de3464f.tar.gz
drivers/rtc/rtc-rv3029c2.c: fix potential race condition
RTC drivers must not return an error after device registration. Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com> Acked-by: Alessandro Zummo <a.zummo@towertech.it> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/rtc')
-rw-r--r--drivers/rtc/rtc-rv3029c2.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/rtc/rtc-rv3029c2.c b/drivers/rtc/rtc-rv3029c2.c
index 1a779a6..e9ac5a4 100644
--- a/drivers/rtc/rtc-rv3029c2.c
+++ b/drivers/rtc/rtc-rv3029c2.c
@@ -395,6 +395,12 @@ static int rv3029c2_probe(struct i2c_client *client,
if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_EMUL))
return -ENODEV;
+ rc = rv3029c2_i2c_get_sr(client, buf);
+ if (rc < 0) {
+ dev_err(&client->dev, "reading status failed\n");
+ return rc;
+ }
+
rtc = devm_rtc_device_register(&client->dev, client->name,
&rv3029c2_rtc_ops, THIS_MODULE);
@@ -403,12 +409,6 @@ static int rv3029c2_probe(struct i2c_client *client,
i2c_set_clientdata(client, rtc);
- rc = rv3029c2_i2c_get_sr(client, buf);
- if (rc < 0) {
- dev_err(&client->dev, "reading status failed\n");
- return rc;
- }
-
return 0;
}
OpenPOWER on IntegriCloud