svn commit: r259236 - stable/10/sys/dev/drm2/radeon

[Jean-Sebastien Pedron]

Author: dumbbell
Date: Wed Dec 11 23:06:03 2013
New Revision: 259236
URL: http://svnweb.freebsd.org/changeset/base/259236

Log:
  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 at gmail.com>

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

Modified: stable/10/sys/dev/drm2/radeon/atombios_dp.c
==============================================================================
--- stable/10/sys/dev/drm2/radeon/atombios_dp.c	Wed Dec 11 22:36:20 2013	(r259235)
+++ stable/10/sys/dev/drm2/radeon/atombios_dp.c	Wed Dec 11 23:06:03 2013	(r259236)
@@ -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;