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

Commit cb8799ee authored by Johannes Weiner's avatar Johannes Weiner Committed by Linus Torvalds
Browse files

rtc-x1205: reset clock to sane state after power failure 



When detecting power failure, the probe function would reset the clock
time to defined state.

However, the clock's _date_ might still be bogus and a subsequent probe
fails when sanity-checking these values.

Change the power-failure fixup code to do a full setting of rtc_time,
including a valid date.

Signed-off-by: default avatarJohannes Weiner <jw@emlix.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Paul Gortmaker <p_gortmaker@yahoo.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 48a7f774

drivers/rtc/rtc-x1205.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -280,9 +280,9 @@ static int x1205_fix_osc(struct i2c_client *client) 
	int err;

	int err;

	struct rtc_time tm;

	struct rtc_time tm;





	tm.tm_hour = tm.tm_min = tm.tm_sec = 0;

	memset(&tm, 0, sizeof(tm));





	err = x1205_set_datetime(client, &tm, 0, X1205_CCR_BASE, 0);

	err = x1205_set_datetime(client, &tm, 1, X1205_CCR_BASE, 0);

	if (err < 0)

	if (err < 0)

		dev_err(&client->dev, "unable to restart the oscillator\n");

		dev_err(&client->dev, "unable to restart the oscillator\n");