From 2352ec9bfab20761cc898ea40db2a7c6d53e81f3 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@airlied2.(none)>
Date: Wed, 18 Apr 2007 10:39:58 +1000
Subject: [PATCH] backout alanh's broken commit

---
 linux-core/intel_sdvo.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/linux-core/intel_sdvo.c b/linux-core/intel_sdvo.c
index 6f592f8..5dbfb8e 100644
--- a/linux-core/intel_sdvo.c
+++ b/linux-core/intel_sdvo.c
@@ -70,10 +70,9 @@ static void intel_sdvo_write_sdvox(struct drm_output *output, u32 val)
 	int i;
 
 	if (sdvo_priv->output_device == SDVOB)
-		bval = I915_READ(SDVOB);
-	else
 		cval = I915_READ(SDVOC);
-	
+	else
+		bval = I915_READ(SDVOB);
 	/*
 	 * Write the registers twice for luck. Sometimes,
 	 * writing them only once doesn't appear to 'stick'.
-- 
2.7.4