---

yaml --- r: 299353 b: refs/heads/master c: e363250 h: refs/heads/master i: 299351: 25ab1e5 v: v3
git-mirror · Apr 19, 2012 · e873e46 · e873e46
1 parent bbc8a23
commit e873e46
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b10c6d4b50cbbdccce2187c1ccc516a9c7335835
+refs/heads/master: e36325071832f1ba96ac54fb8ba1459f08b05dd8
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_connectors.c b/trunk/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -970,7 +970,7 @@ radeon_dvi_detect(struct drm_connector *connector, bool force)
 
 			encoder = obj_to_encoder(obj);
 
-			if (encoder->encoder_type != DRM_MODE_ENCODER_DAC ||
+			if (encoder->encoder_type != DRM_MODE_ENCODER_DAC &&
 			    encoder->encoder_type != DRM_MODE_ENCODER_TVDAC)
 				continue;