summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordumbbell <dumbbell@FreeBSD.org>2013-12-11 23:06:03 +0000
committerdumbbell <dumbbell@FreeBSD.org>2013-12-11 23:06:03 +0000
commit91ba4c72da3601dc554ecaee0588fd32c38b1723 (patch)
tree2a9a8016f35bb350fdff06ccb4282eedc997e2be
parent66bcaa96d680466f9c02406d1c9c6f6fa8147efe (diff)
downloadFreeBSD-src-91ba4c72da3601dc554ecaee0588fd32c38b1723.zip
FreeBSD-src-91ba4c72da3601dc554ecaee0588fd32c38b1723.tar.gz
MFC r259104:
drm/radeon: radeon_dp_i2c_aux_ch() must return 0 on FreeBSD The code was unmodified compared to Linux and returned the amount of received bytes from the i2c bus. This led to non-working i2c bus and failure to eg. read monitor's EDID, if connected to DisplayPort. Tested by: Mikaƫl Urankar <mikael.urankar@gmail.com>
-rw-r--r--sys/dev/drm2/radeon/atombios_dp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/drm2/radeon/atombios_dp.c b/sys/dev/drm2/radeon/atombios_dp.c
index 3c0f7f5..f92df62 100644
--- a/sys/dev/drm2/radeon/atombios_dp.c
+++ b/sys/dev/drm2/radeon/atombios_dp.c
@@ -272,7 +272,7 @@ int radeon_dp_i2c_aux_ch(device_t dev, int mode, u8 write_byte, u8 *read_byte)
case AUX_I2C_REPLY_ACK:
if (mode == MODE_I2C_READ)
*read_byte = reply[0];
- return ret;
+ return (0); /* Return ret on Linux. */
case AUX_I2C_REPLY_NACK:
DRM_DEBUG_KMS("aux_i2c nack\n");
return -EREMOTEIO;
OpenPOWER on IntegriCloud