diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-01 13:55:54 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-01 13:55:54 -0400 |
| commit | b10c4d40b3e413a908072acc53dea13e90c39aff (patch) | |
| tree | 3e487da92de125a35b267d8f7ac98878b9fd1fa6 /drivers/i2c/busses/i2c-octeon.c | |
| parent | 303a407002db563ae76d0f8a8ef0d8fe7954fcd4 (diff) | |
| parent | 7031307aefb6048377385dbb0af2dd43bb0190bb (diff) | |
Merge branch 'for-linus/i2c/2636-rc5' of git://git.fluff.org/bjdooks/linux
* 'for-linus/i2c/2636-rc5' of git://git.fluff.org/bjdooks/linux:
i2c-s3c2410: fix calculation of SDA line delay
i2c-davinci: Fix race when setting up for TX
i2c-octeon: Return -ETIMEDOUT in octeon_i2c_wait() on timeout
Diffstat (limited to 'drivers/i2c/busses/i2c-octeon.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-octeon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-octeon.c b/drivers/i2c/busses/i2c-octeon.c index 0e9f85d0a835..56dbe54e8811 100644 --- a/drivers/i2c/busses/i2c-octeon.c +++ b/drivers/i2c/busses/i2c-octeon.c | |||
| @@ -218,7 +218,7 @@ static int octeon_i2c_wait(struct octeon_i2c *i2c) | |||
| 218 | return result; | 218 | return result; |
| 219 | } else if (result == 0) { | 219 | } else if (result == 0) { |
| 220 | dev_dbg(i2c->dev, "%s: timeout\n", __func__); | 220 | dev_dbg(i2c->dev, "%s: timeout\n", __func__); |
| 221 | result = -ETIMEDOUT; | 221 | return -ETIMEDOUT; |
| 222 | } | 222 | } |
| 223 | 223 | ||
| 224 | return 0; | 224 | return 0; |