diff options
| author | Jerome Glisse <jglisse@redhat.com> | 2013-11-06 17:42:02 -0500 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2013-11-15 15:29:32 -0500 |
| commit | fae009d15a44e5f1d938340facf4b8bc7dc69a09 (patch) | |
| tree | c338145b700b91839aaae362e983a50b2516c150 | |
| parent | 936b32643cb03dcb34ef5dab81970229b1cc2a33 (diff) | |
| download | op-kernel-dev-fae009d15a44e5f1d938340facf4b8bc7dc69a09.zip op-kernel-dev-fae009d15a44e5f1d938340facf4b8bc7dc69a09.tar.gz | |
radeon/i2c: do not count reg index in number of i2c byte we are writing.
Useless to count the register index in number of bytes we are writing.
Fixes a regression with hw i2c enabled.
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
| -rw-r--r-- | drivers/gpu/drm/radeon/atombios_i2c.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/atombios_i2c.c b/drivers/gpu/drm/radeon/atombios_i2c.c index deaf98c..0652ee0 100644 --- a/drivers/gpu/drm/radeon/atombios_i2c.c +++ b/drivers/gpu/drm/radeon/atombios_i2c.c @@ -56,8 +56,10 @@ static int radeon_process_i2c_ch(struct radeon_i2c_chan *chan, return -EINVAL; } args.ucRegIndex = buf[0]; - if (num > 1) - memcpy(&out, &buf[1], num - 1); + if (num > 1) { + num--; + memcpy(&out, &buf[1], num); + } args.lpI2CDataOut = cpu_to_le16(out); } else { if (num > ATOM_MAX_HW_I2C_READ) { |
