diff options
| author | Alexandre Belloni <alexandre.belloni@bootlin.com> | 2018-02-12 23:47:33 +0100 |
|---|---|---|
| committer | Alexandre Belloni <alexandre.belloni@bootlin.com> | 2018-03-01 10:49:23 +0100 |
| commit | ce1ae8eb83bee42c5a0dbcc01346e41c6e85da43 (patch) | |
| tree | a95775bba15fb139d0bccb163729dc831c7c16a0 /drivers/rtc/rtc-rv8803.c | |
| parent | c07fd9dea2fab9f4b1f246b766e124606cef187f (diff) | |
| download | linux-ce1ae8eb83bee42c5a0dbcc01346e41c6e85da43.tar.gz | |
rtc: rv8803: fix possible race condition
The probe function is not allowed to fail after registering the RTC. Call
rtc_register_device() at the end.
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Diffstat (limited to 'drivers/rtc/rtc-rv8803.c')
| -rw-r--r-- | drivers/rtc/rtc-rv8803.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/rtc/rtc-rv8803.c b/drivers/rtc/rtc-rv8803.c index 6fb5041f750b3..29fc3d2103923 100644 --- a/drivers/rtc/rtc-rv8803.c +++ b/drivers/rtc/rtc-rv8803.c @@ -590,14 +590,6 @@ static int rv8803_probe(struct i2c_client *client, } } - rv8803->rtc->ops = &rv8803_rtc_ops; - rv8803->rtc->nvram_old_abi = true; - err = rtc_register_device(rv8803->rtc); - if (err) - return err; - - rtc_nvmem_register(rv8803->rtc, &nvmem_cfg); - err = rv8803_write_reg(rv8803->client, RV8803_EXT, RV8803_EXT_WADA); if (err) return err; @@ -608,6 +600,14 @@ static int rv8803_probe(struct i2c_client *client, return err; } + rv8803->rtc->ops = &rv8803_rtc_ops; + rv8803->rtc->nvram_old_abi = true; + err = rtc_register_device(rv8803->rtc); + if (err) + return err; + + rtc_nvmem_register(rv8803->rtc, &nvmem_cfg); + rv8803->rtc->max_user_freq = 1; return 0; |