svn commit: r259370 - releng/10.0/sys/dev/drm2/radeon

[Jean-Sebastien Pedron]

Author: dumbbell
Date: Sat Dec 14 00:40:47 2013
New Revision: 259370
URL: http://svnweb.freebsd.org/changeset/base/259370

Log:
  MFC r259236:
  
  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 at gmail.com>
  Approved by:	re (gjb)

Modified:
  releng/10.0/sys/dev/drm2/radeon/atombios_dp.c
Directory Properties:
  releng/10.0/   (props changed)

Modified: releng/10.0/sys/dev/drm2/radeon/atombios_dp.c
==============================================================================
--- releng/10.0/sys/dev/drm2/radeon/atombios_dp.c	Sat Dec 14 00:36:29 2013	(r259369)
+++ releng/10.0/sys/dev/drm2/radeon/atombios_dp.c	Sat Dec 14 00:40:47 2013	(r259370)
@@ -272,7 +272,7 @@ int radeon_dp_i2c_aux_ch(device_t dev, i
 		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;