diff options
| author | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2007-04-18 11:55:09 +0100 |
|---|---|---|
| committer | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2007-04-18 11:55:09 +0100 |
| commit | ef2bce3a16428feb89f447e528bdea00c1066b8b (patch) | |
| tree | 7a7fcabf3a490200acd6da22c393df994bcbf9a3 /linux-core/intel_sdvo.c | |
| parent | 51e867c57880c85c87e187af0a667e9b99413206 (diff) | |
| parent | 20b2949e3738bc900407d6aeddc6338f05b0b169 (diff) | |
Merge remote branch 'origin/modesetting-101' into modesetting-101
Diffstat (limited to 'linux-core/intel_sdvo.c')
| -rw-r--r-- | linux-core/intel_sdvo.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/linux-core/intel_sdvo.c b/linux-core/intel_sdvo.c index 67c3329d..c9bc692e 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'. |