Skip to content

Commit

Permalink
bq27x00: Use single i2c_transfer call for property read
Browse files Browse the repository at this point in the history
Doing this by using 2 calls sometimes results in unexpected
values being returned on OMAP3 i2c controller.

Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
  • Loading branch information
Grazvydas Ignotas authored and Lars-Peter Clausen committed Feb 22, 2011
1 parent 2ec523a commit 9e912f4
Showing 1 changed file with 11 additions and 16 deletions.
27 changes: 11 additions & 16 deletions drivers/power/bq27x00_battery.c
Original file line number Diff line number Diff line change
Expand Up @@ -565,31 +565,26 @@ static DEFINE_MUTEX(battery_mutex);
static int bq27x00_read_i2c(struct bq27x00_device_info *di, u8 reg, bool single)
{
struct i2c_client *client = to_i2c_client(di->dev);
struct i2c_msg msg;
struct i2c_msg msg[2];
unsigned char data[2];
int ret;

if (!client->adapter)
return -ENODEV;

msg.addr = client->addr;
msg.flags = 0;
msg.len = 1;
msg.buf = data;

data[0] = reg;
ret = i2c_transfer(client->adapter, &msg, 1);

if (ret < 0)
return ret;

msg[0].addr = client->addr;
msg[0].flags = 0;
msg[0].buf = &reg;
msg[0].len = sizeof(reg);
msg[1].addr = client->addr;
msg[1].flags = I2C_M_RD;
msg[1].buf = data;
if (single)
msg.len = 1;
msg[1].len = 1;
else
msg.len = 2;
msg[1].len = 2;

msg.flags = I2C_M_RD;
ret = i2c_transfer(client->adapter, &msg, 1);
ret = i2c_transfer(client->adapter, msg, ARRAY_SIZE(msg));
if (ret < 0)
return ret;

Expand Down

0 comments on commit 9e912f4

Please sign in to comment.