diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-22 07:20:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-22 07:20:30 -0700 |
| commit | b7b6cf005b59ff5a4dba10338954c3dcfc75ef7b (patch) | |
| tree | 1ee58483cb0f54acfc76a9800412f1cce77c0c57 /drivers/i2c/busses/i2c-stu300.c | |
| parent | 74a920139a0f1119c5a604cef0ce5d6f591dc782 (diff) | |
| parent | 42df64b1f83fa9b786067a0b5a3aca0fbb2d8db8 (diff) | |
Merge branch 'for-linus/i2c' of git://git.fluff.org/bjdooks/linux
* 'for-linus/i2c' of git://git.fluff.org/bjdooks/linux:
i2c-stu300: off by one issue
i2c-pnx: Add stop conditions for end of transfer
i2c-pnx: Limit maximum divider to 1023
i2c-omap: fix OOPS in omap_i2c_unidle() during probe
i2c-imx: fix error handling
Diffstat (limited to 'drivers/i2c/busses/i2c-stu300.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-stu300.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-stu300.c b/drivers/i2c/busses/i2c-stu300.c index 1f5b38be73b..495be451d32 100644 --- a/drivers/i2c/busses/i2c-stu300.c +++ b/drivers/i2c/busses/i2c-stu300.c @@ -498,7 +498,7 @@ static int stu300_set_clk(struct stu300_dev *dev, unsigned long clkrate) int i = 0; /* Locate the apropriate clock setting */ - while (i < ARRAY_SIZE(stu300_clktable) && + while (i < ARRAY_SIZE(stu300_clktable) - 1 && stu300_clktable[i].rate < clkrate) i++; |