diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-19 02:38:23 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-19 02:38:23 -0500 |
| commit | 198d6ba4d7f48c94f990f4604f0b3d73925e0ded (patch) | |
| tree | 56bbdf8ba2553c23c8099da9344a8f1d1aba97ab /drivers/i2c | |
| parent | 9a57f7fabd383920585ed8b74eacd117c6551f2d (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/isdn/i4l/isdn_net.c
fs/cifs/connect.c
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-sh_mobile.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-sh_mobile.c b/drivers/i2c/busses/i2c-sh_mobile.c index 640cbb237328..3384a717fec0 100644 --- a/drivers/i2c/busses/i2c-sh_mobile.c +++ b/drivers/i2c/busses/i2c-sh_mobile.c | |||
| @@ -318,7 +318,8 @@ static int sh_mobile_i2c_isr_rx(struct sh_mobile_i2c_data *pd) | |||
| 318 | } else | 318 | } else |
| 319 | data = i2c_op(pd, OP_RX, 0); | 319 | data = i2c_op(pd, OP_RX, 0); |
| 320 | 320 | ||
| 321 | pd->msg->buf[real_pos] = data; | 321 | if (real_pos >= 0) |
| 322 | pd->msg->buf[real_pos] = data; | ||
| 322 | } while (0); | 323 | } while (0); |
| 323 | 324 | ||
| 324 | pd->pos++; | 325 | pd->pos++; |