Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 200648
b: refs/heads/master
c: 96fc3a4
h: refs/heads/master
v: v3
  • Loading branch information
Joakim Tjernlund authored and Linus Torvalds committed Jun 29, 2010
1 parent 02e4c38 commit 0d85988
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a02875a67d745322801bafb5fa2c5e4e62c3ceab
refs/heads/master: 96fc3a45ea073136566f3c2676cad52f8b39a7df
4 changes: 2 additions & 2 deletions trunk/drivers/rtc/rtc-ds1307.c
Original file line number Diff line number Diff line change
Expand Up @@ -777,7 +777,7 @@ static int __devinit ds1307_probe(struct i2c_client *client,

read_rtc:
/* 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) {
pr_debug("read error %d\n", tmp);
err = -EIO;
Expand Down Expand Up @@ -862,7 +862,7 @@ static int __devinit ds1307_probe(struct i2c_client *client,
if (ds1307->regs[DS1307_REG_HOUR] & DS1307_BIT_PM)
tmp += 12;
i2c_smbus_write_byte_data(client,
DS1307_REG_HOUR,
ds1307->offset + DS1307_REG_HOUR,
bin2bcd(tmp));
}

Expand Down

0 comments on commit 0d85988

Please sign in to comment.