diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
| commit | fac56c2df51bc29b07b3c2dcfabf32a015a0522c (patch) | |
| tree | 1ff5d84ecf4ea0bcbd42e2ef9624b5ade3810890 /drivers/i2c/busses/i2c-isch.c | |
| parent | 6caa15d0b84d2ea688fd31f4f172c8353463e109 (diff) | |
| parent | a6360dd37e1a144ed11e6548371bade559a1e4df (diff) | |
Merge commit 'v2.6.39-rc3' into for-2.6.39
Diffstat (limited to 'drivers/i2c/busses/i2c-isch.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-isch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-isch.c b/drivers/i2c/busses/i2c-isch.c index ddc258edb34f..0682f8f277b0 100644 --- a/drivers/i2c/busses/i2c-isch.c +++ b/drivers/i2c/busses/i2c-isch.c | |||
| @@ -141,7 +141,7 @@ static int sch_transaction(void) | |||
| 141 | * This is the main access entry for i2c-sch access | 141 | * This is the main access entry for i2c-sch access |
| 142 | * adap is i2c_adapter pointer, addr is the i2c device bus address, read_write | 142 | * adap is i2c_adapter pointer, addr is the i2c device bus address, read_write |
| 143 | * (0 for read and 1 for write), size is i2c transaction type and data is the | 143 | * (0 for read and 1 for write), size is i2c transaction type and data is the |
| 144 | * union of transaction for data to be transfered or data read from bus. | 144 | * union of transaction for data to be transferred or data read from bus. |
| 145 | * return 0 for success and others for failure. | 145 | * return 0 for success and others for failure. |
| 146 | */ | 146 | */ |
| 147 | static s32 sch_access(struct i2c_adapter *adap, u16 addr, | 147 | static s32 sch_access(struct i2c_adapter *adap, u16 addr, |