summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2011-05-25 11:34:52 +0200
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2011-08-19 10:35:34 +0200
commitc272d64111c4fdc0b6a2122452e98a3315bd6b4b (patch)
treec3e26beda7fd261389f6e1c9d725d7c9bb40f0a3
parent2883cebabbc4efc00408024d284a0230ad3af8a0 (diff)
downloadlinux-3.10-c272d64111c4fdc0b6a2122452e98a3315bd6b4b.tar.gz
linux-3.10-c272d64111c4fdc0b6a2122452e98a3315bd6b4b.tar.bz2
linux-3.10-c272d64111c4fdc0b6a2122452e98a3315bd6b4b.zip
vga16fb: use display information in info not in var for panning
We must not use any information in the passed var besides xoffset, yoffset and vmode as otherwise applications might abuse it. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-rw-r--r--drivers/video/vga16fb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/vga16fb.c b/drivers/video/vga16fb.c
index 305c975b178..0267acd8dc8 100644
--- a/drivers/video/vga16fb.c
+++ b/drivers/video/vga16fb.c
@@ -207,7 +207,7 @@ static void vga16fb_pan_var(struct fb_info *info,
* granularity if someone supports xoffset in bit resolution */
vga_io_r(VGA_IS1_RC); /* reset flip-flop */
vga_io_w(VGA_ATT_IW, VGA_ATC_PEL);
- if (var->bits_per_pixel == 8)
+ if (info->var.bits_per_pixel == 8)
vga_io_w(VGA_ATT_IW, (xoffset & 3) << 1);
else
vga_io_w(VGA_ATT_IW, xoffset & 7);