diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2013-12-17 13:09:42 -0500 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2013-12-17 13:09:42 -0500 |
| commit | 5af7f998909e5c73649a9f96cf2d4ace6affbaa5 (patch) | |
| tree | 988bde645dfda5e314d99b03acc6fd3c0885f229 /drivers/gpu/drm/radeon/atombios_i2c.c | |
| parent | 97e7e161945d7fa1c3641d6c2f7ec1e7ef7d2eb8 (diff) | |
| parent | 108dd62e1e27b41c93fb30f8005552cf1dd2059c (diff) | |
Merge tag 'v3.8.13.14' into v3.8-rt
v3.8.13.14
Diffstat (limited to 'drivers/gpu/drm/radeon/atombios_i2c.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/atombios_i2c.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/atombios_i2c.c b/drivers/gpu/drm/radeon/atombios_i2c.c index 2ca389d19258..4bb4b7a01084 100644 --- a/drivers/gpu/drm/radeon/atombios_i2c.c +++ b/drivers/gpu/drm/radeon/atombios_i2c.c @@ -55,7 +55,10 @@ static int radeon_process_i2c_ch(struct radeon_i2c_chan *chan, DRM_ERROR("hw i2c: tried to write too many bytes (%d vs 2)\n", num); return -EINVAL; } - memcpy(&out, buf, num); + if (num > 1) { + num--; + memcpy(&out, &buf[1], num); + } args.lpI2CDataOut = cpu_to_le16(out); } else { if (num > ATOM_MAX_HW_I2C_READ) { |