Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce1ae8eb authored by Alexandre Belloni's avatar Alexandre Belloni
Browse files

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: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent c07fd9de

drivers/rtc/rtc-rv8803.c

+8 −8
Original line number Diff line number Diff line
@@ -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;