summaryrefslogtreecommitdiffstats
path: root/drivers/video/pm3fb.c
diff options
context:
space:
mode:
authorKrzysztof Helt <krzysztof.h1@wp.pl>2007-10-16 01:28:31 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-16 09:43:14 -0700
commitf259ebb67b61bd8276fbfba43e119e68754be027 (patch)
tree0facbd973e17af84656e57f9614888a70906129d /drivers/video/pm3fb.c
parent65faaeb359b4ed1991b32b381bf155fa9b85293f (diff)
downloadlinux-f259ebb67b61bd8276fbfba43e119e68754be027.tar.bz2
pm3fb: header file reduction
This patch removes constants named AAA_DISABLE with value 0. They are redudant and misleading ( a |= AAA_DISABLE does nothing and usually should be a &= ~AAA_ENABLE). Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> 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>
Diffstat (limited to 'drivers/video/pm3fb.c')
-rw-r--r--drivers/video/pm3fb.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/video/pm3fb.c b/drivers/video/pm3fb.c
index 438872a5f43f..0e63f03b5367 100644
--- a/drivers/video/pm3fb.c
+++ b/drivers/video/pm3fb.c
@@ -886,7 +886,7 @@ static int pm3fb_set_par(struct fb_info *info)
if ((info->var.activate & FB_ACTIVATE_MASK) == FB_ACTIVATE_NOW)
par->video |= PM3VideoControl_ENABLE;
else {
- par->video |= PM3VideoControl_DISABLE;
+ par->video &= ~PM3VideoControl_ENABLE;
DPRINTK("PM3Video disabled\n");
}
switch (bpp) {
@@ -911,8 +911,7 @@ static int pm3fb_set_par(struct fb_info *info)
/* pm3fb_clear_memory(info, 0);*/
pm3fb_clear_colormap(par, 0, 0, 0);
- PM3_WRITE_DAC_REG(par, PM3RD_CursorMode,
- PM3RD_CursorMode_CURSOR_DISABLE);
+ PM3_WRITE_DAC_REG(par, PM3RD_CursorMode, 0);
pm3fb_init_engine(info);
pm3fb_write_mode(info);
return 0;