Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rtc: fix ds1388 time corruption

Browse source 
The ds1307 driver misreads the ds1388 registers when checking for 12 or 24
hour mode.  Instead of checking the hour register it reads the minute
register.  Therefore the driver thinks minutes >= 40 has the 12HR bit set
and resets the minute register by zeroing the high bits.  This results in
minutes are reset to 0-9, jumping back in time 40 or 50 minutes.  The time
jump is also written back to the RTC.

Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
Cc: Wan ZongShun <mcuos.com@gmail.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Paul Gortmaker <p_gortmaker@yahoo.com>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Joakim Tjernlund 2010-06-29 15:05:34 -07:00 committed by Linus Torvalds
parent a02875a67d
commit 96fc3a45ea
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/rtc/rtc-ds1307.c
View file

@ -777,7 +777,7 @@ static int __devinit ds1307_probe(struct i2c_client *client,
read_rtc: read_rtc:
/* read RTC registers */ /* read RTC registers */
tmp = ds1307->read_block_data(ds1307->client, 0, 8, buf); tmp = ds1307->read_block_data(ds1307->client, ds1307->offset, 8, buf);
if (tmp != 8) { if (tmp != 8) {
pr_debug("read error %d\n", tmp); pr_debug("read error %d\n", tmp);
err = -EIO; err = -EIO;
@ -862,7 +862,7 @@ static int __devinit ds1307_probe(struct i2c_client *client,
if (ds1307->regs[DS1307_REG_HOUR] & DS1307_BIT_PM) if (ds1307->regs[DS1307_REG_HOUR] & DS1307_BIT_PM)
tmp += 12; tmp += 12;
i2c_smbus_write_byte_data(client, i2c_smbus_write_byte_data(client,
DS1307_REG_HOUR, ds1307->offset + DS1307_REG_HOUR,
bin2bcd(tmp)); bin2bcd(tmp));
} }