Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 330125
b: refs/heads/master
c: 84cab86
h: refs/heads/master
i:
  330123: b15f124
v: v3
  • Loading branch information
Shubhrajyoti D authored and Linus Torvalds committed Oct 5, 2012
1 parent bacc30f commit aec464e
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 4 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: 885ccbb357163271db6a6865b2b4b1888180094c
refs/heads/master: 84cab86cb816aa439905c2112931c3649a67427f
17 changes: 14 additions & 3 deletions trunk/drivers/rtc/rtc-em3027.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,17 @@ static int em3027_get_time(struct device *dev, struct rtc_time *tm)
unsigned char buf[7];

struct i2c_msg msgs[] = {
{client->addr, 0, 1, &addr}, /* setup read addr */
{client->addr, I2C_M_RD, 7, buf}, /* read time/date */
{/* setup read addr */
.addr = client->addr,
.len = 1,
.buf = &addr
},
{/* read time/date */
.addr = client->addr,
.flags = I2C_M_RD,
.len = 7,
.buf = buf
},
};

/* read time/date registers */
Expand All @@ -76,7 +85,9 @@ static int em3027_set_time(struct device *dev, struct rtc_time *tm)
unsigned char buf[8];

struct i2c_msg msg = {
client->addr, 0, 8, buf, /* write time/date */
.addr = client->addr,
.len = 8,
.buf = buf, /* write time/date */
};

buf[0] = EM3027_REG_WATCH_SEC;
Expand Down

0 comments on commit aec464e

Please sign in to comment.