From 54cca5e13c611f2cf3206a838cc72d784e353796 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@amd.com>
Date: Tue, 12 Feb 2013 08:39:10 -0500
Subject: [PATCH] --- yaml --- r: 358325 b: refs/heads/master c:
 c944b2abb067130542055666f23409fd5e1afc8e h: refs/heads/master i:   358323:
 485913d3baf53173e2171fd88aca8f179fca2748 v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/gpu/drm/radeon/r600_hdmi.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e64b25e152dd..bc1306b6f5a6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ae764b11ed63279e9dcf25be972ff4ca21a9875
+refs/heads/master: c944b2abb067130542055666f23409fd5e1afc8e
diff --git a/trunk/drivers/gpu/drm/radeon/r600_hdmi.c b/trunk/drivers/gpu/drm/radeon/r600_hdmi.c
index ff80efe9cb7d..95970ec47c45 100644
--- a/trunk/drivers/gpu/drm/radeon/r600_hdmi.c
+++ b/trunk/drivers/gpu/drm/radeon/r600_hdmi.c
@@ -544,7 +544,6 @@ void r600_hdmi_disable(struct drm_encoder *encoder)
 
 	/* Called for ATOM_ENCODER_MODE_HDMI only */
 	if (!dig || !dig->afmt) {
-		WARN_ON(1);
 		return;
 	}
 	if (!dig->afmt->enabled)