summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
authorDave Airlie <airlied@airlied2.(none)>2007-04-18 10:39:58 +1000
committerDave Airlie <airlied@airlied2.(none)>2007-04-18 10:39:58 +1000
commit2352ec9bfab20761cc898ea40db2a7c6d53e81f3 (patch)
treeeae7eab640f00eb57d86069f7c141ec11583fb2a /linux-core
parent7c9e19ba55dcdf212845253648194115639fe7b6 (diff)
backout alanh's broken commit
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/intel_sdvo.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/linux-core/intel_sdvo.c b/linux-core/intel_sdvo.c
index 6f592f8a..5dbfb8eb 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'.