Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 172358
b: refs/heads/master
c: d7d838a
h: refs/heads/master
v: v3
  • Loading branch information
Jean Delvare committed Dec 6, 2009
1 parent 8fee242 commit 77c72e1
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 6 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: 02864d58ce102804b148c92e44726d9571d65d1e
refs/heads/master: d7d838a6ebbab6e786148133b6cf9617144603b4
28 changes: 23 additions & 5 deletions trunk/drivers/i2c/busses/i2c-powermac.c
Original file line number Diff line number Diff line change
Expand Up @@ -108,16 +108,25 @@ static s32 i2c_powermac_smbus_xfer( struct i2c_adapter* adap,
}

rc = pmac_i2c_open(bus, 0);
if (rc)
if (rc) {
dev_err(&adap->dev, "Failed to open I2C, err %d\n", rc);
return rc;
}

rc = pmac_i2c_setmode(bus, mode);
if (rc)
if (rc) {
dev_err(&adap->dev, "Failed to set I2C mode %d, err %d\n",
mode, rc);
goto bail;
}

rc = pmac_i2c_xfer(bus, addrdir, subsize, subaddr, buf, len);
if (rc)
if (rc) {
dev_err(&adap->dev,
"I2C transfer at 0x%02x failed, size %d, err %d\n",
addrdir >> 1, size, rc);
goto bail;
}

if (size == I2C_SMBUS_WORD_DATA && read) {
data->word = ((u16)local[1]) << 8;
Expand Down Expand Up @@ -157,12 +166,21 @@ static int i2c_powermac_master_xfer( struct i2c_adapter *adap,
addrdir ^= 1;

rc = pmac_i2c_open(bus, 0);
if (rc)
if (rc) {
dev_err(&adap->dev, "Failed to open I2C, err %d\n", rc);
return rc;
}
rc = pmac_i2c_setmode(bus, pmac_i2c_mode_std);
if (rc)
if (rc) {
dev_err(&adap->dev, "Failed to set I2C mode %d, err %d\n",
pmac_i2c_mode_std, rc);
goto bail;
}
rc = pmac_i2c_xfer(bus, addrdir, 0, 0, msgs->buf, msgs->len);
if (rc < 0)
dev_err(&adap->dev, "I2C %s 0x%02x failed, err %d\n",
addrdir & 1 ? "read from" : "write to", addrdir >> 1,
rc);
bail:
pmac_i2c_close(bus);
return rc < 0 ? rc : 1;
Expand Down

0 comments on commit 77c72e1

Please sign in to comment.