diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-09-09 06:48:07 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-09-09 06:48:07 +0200 |
commit | bdea534db894ea19320f470ce2e63b1d9de96a15 (patch) | |
tree | 8ec2a0a93d9bb5e7205253c67aa624b9ec227477 /drivers/i2c/busses/i2c-rk3x.c | |
parent | 39b5a56ec0be5effe9b7d0f18cb27724bf2e5d47 (diff) | |
parent | 2ce7598c9a453e0acd0e07be7be3f5eb39608ebd (diff) | |
download | linux-bdea534db894ea19320f470ce2e63b1d9de96a15.tar.gz |
Merge tag 'v3.17-rc4' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/i2c/busses/i2c-rk3x.c')
-rw-r--r-- | drivers/i2c/busses/i2c-rk3x.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/i2c/busses/i2c-rk3x.c b/drivers/i2c/busses/i2c-rk3x.c index 69e11853e8bf..e637c32ae517 100644 --- a/drivers/i2c/busses/i2c-rk3x.c +++ b/drivers/i2c/busses/i2c-rk3x.c @@ -323,6 +323,10 @@ static void rk3x_i2c_handle_read(struct rk3x_i2c *i2c, unsigned int ipd) /* ack interrupt */ i2c_writel(i2c, REG_INT_MBRF, REG_IPD); + /* Can only handle a maximum of 32 bytes at a time */ + if (len > 32) + len = 32; + /* read the data from receive buffer */ for (i = 0; i < len; ++i) { if (i % 4 == 0) |