Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit cb8799eeddd542abd504c62c11014dfbaec7f3a1

Authored by Johannes Weiner
Committed by Linus Torvalds
1 parent 48a7f77468
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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: Johannes Weiner <jw@emlix.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Paul Gortmaker <p_gortmaker@yahoo.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

drivers/rtc/rtc-x1205.c
Diff comments   View file @ cb8799e
... ... @@ -280,9 +280,9 @@
280 280 int err;
281 281 struct rtc_time tm;
282 282  
283   - tm.tm_hour = tm.tm_min = tm.tm_sec = 0;
  283 + memset(&tm, 0, sizeof(tm));
284 284  
285   - err = x1205_set_datetime(client, &tm, 0, X1205_CCR_BASE, 0);
  285 + err = x1205_set_datetime(client, &tm, 1, X1205_CCR_BASE, 0);
286 286 if (err < 0)
287 287 dev_err(&client->dev, "unable to restart the oscillator\n");
288 288