summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntonino A. Daplas <adaplas@gmail.com>2007-09-19 07:46:34 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-09-19 20:24:18 +0200
commit8c8bd037e5bd7bbc3c82b74cbed4da1ddc3fe8de (patch)
tree9913c9aa048facdcf6d056cc0503588dc0d12f65
parentxen: don't bother trying to set cr4 (diff)
downloadlinux-8c8bd037e5bd7bbc3c82b74cbed4da1ddc3fe8de.tar.xz
linux-8c8bd037e5bd7bbc3c82b74cbed4da1ddc3fe8de.zip
intelfb: Fix bug in DPLL disable
Reported in Kernel Bugzilla 9006 Fix an obvious bug in DPLL disable. Signed-off-by: Antonino Daplas <adaplas@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/video/intelfb/intelfbhw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/intelfb/intelfbhw.c b/drivers/video/intelfb/intelfbhw.c
index b21d0dec9283..6a47682d8614 100644
--- a/drivers/video/intelfb/intelfbhw.c
+++ b/drivers/video/intelfb/intelfbhw.c
@@ -1352,7 +1352,7 @@ intelfbhw_program_mode(struct intelfb_info *dinfo,
/* turn off PLL */
tmp = INREG(dpll_reg);
- dpll_reg &= ~DPLL_VCO_ENABLE;
+ tmp &= ~DPLL_VCO_ENABLE;
OUTREG(dpll_reg, tmp);
/* Set PLL parameters */