Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 330124
b: refs/heads/master
c: 885ccbb
h: refs/heads/master
v: v3
  • Loading branch information
Shubhrajyoti D authored and Linus Torvalds committed Oct 5, 2012
1 parent b15f124 commit bacc30f
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 5 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: 755e4a4bdc6506a61ce455a650f92d180ef577ff
refs/heads/master: 885ccbb357163271db6a6865b2b4b1888180094c
20 changes: 16 additions & 4 deletions trunk/drivers/rtc/rtc-isl1208.c
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,17 @@ isl1208_i2c_read_regs(struct i2c_client *client, u8 reg, u8 buf[],
{
u8 reg_addr[1] = { reg };
struct i2c_msg msgs[2] = {
{client->addr, 0, sizeof(reg_addr), reg_addr}
,
{client->addr, I2C_M_RD, len, buf}
{
.addr = client->addr,
.len = sizeof(reg_addr),
.buf = reg_addr
},
{
.addr = client->addr,
.flags = I2C_M_RD,
.len = len,
.buf = buf
}
};
int ret;

Expand All @@ -90,7 +98,11 @@ isl1208_i2c_set_regs(struct i2c_client *client, u8 reg, u8 const buf[],
{
u8 i2c_buf[ISL1208_REG_USR2 + 2];
struct i2c_msg msgs[1] = {
{client->addr, 0, len + 1, i2c_buf}
{
.addr = client->addr,
.len = len + 1,
.buf = i2c_buf
}
};
int ret;

Expand Down

0 comments on commit bacc30f

Please sign in to comment.