diff options
| author | Benoit Goby <benoit@android.com> | 2014-04-03 13:23:33 -0700 |
|---|---|---|
| committer | Benoit Goby <benoitgoby@google.com> | 2014-04-03 20:26:27 +0000 |
| commit | 7cab412d33df668ac857024bfbb03350a1b5367f (patch) | |
| tree | 5288a0a5fdf9ac57a45521fed02d8b9fb71a33be | |
| parent | 95af0096209d9e265a4f980439348a4dfddf5395 (diff) | |
| download | olio-linux-3.10-7cab412d33df668ac857024bfbb03350a1b5367f.tar.xz olio-linux-3.10-7cab412d33df668ac857024bfbb03350a1b5367f.zip | |
Revert "rtc: rtc-sensorhub: use ANDROID_EPOCH as the earliest RTC time"
This reverts commit 6dc19f1009dee8f225bcefc07d1f87b9edc9ccf5.
Bug: 13786555
Change-Id: I4bb0d91fc451dfe96b1c34a1dd93d0a47c6dd7fb
| -rw-r--r-- | drivers/rtc/rtc-sensorhub.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/rtc/rtc-sensorhub.c b/drivers/rtc/rtc-sensorhub.c index b403c39b065..92e19700c3b 100644 --- a/drivers/rtc/rtc-sensorhub.c +++ b/drivers/rtc/rtc-sensorhub.c @@ -21,8 +21,6 @@ #define SECONDS_IN_DAY (24*60*60) #define DRIVER_NAME "rtc-sensorhub" -#define ANDROID_EPOCH 1227312001 - struct rtc_sensorhub_private_data { struct rtc_device *p_rtc; struct m4sensorhub_data *p_m4sensorhub_data; @@ -154,8 +152,6 @@ static int rtc_sensorhub_get_rtc_from_m4(struct rtc_time *p_tm, return -EIO; } - if (seconds < ANDROID_EPOCH) - seconds = ANDROID_EPOCH; rtc_time_to_tm(seconds, p_tm); return 0; } @@ -171,8 +167,8 @@ static int rtc_sensorhub_rtc_read_time(struct device *p_dev, if (!(p_priv_data->p_m4sensorhub_data)) { dev_err(p_dev, "read time, but RTC hardware not ready\n"); /* M4 driver is not yet ready, just give the time since boot - and treat boot as start of ANDROID_EPOCH */ - rtc_time_to_tm(ANDROID_EPOCH + get_seconds(), p_tm); + and treat boot as start of epoch */ + rtc_time_to_tm(get_seconds(), p_tm); return 0; } |