From 3ad4261def45aed90f1f7ed5cc4a1b5d417ca993 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Tue, 14 Jun 2011 09:25:04 +0000 Subject: [PATCH] --- yaml --- r: 271241 b: refs/heads/master c: 4d3c68a1b468741fcebfbfb0b92ff9e75a063484 h: refs/heads/master i: 271239: 6b7e15f9a1e85e3647e4df1e1b4a287b2f3fcf85 v: v3 --- [refs] | 2 +- trunk/drivers/video/vga16fb.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b9116f5717d0..8c1afdd21e98 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4c735af0076923643af48577fc9ad6e123a55fa +refs/heads/master: 4d3c68a1b468741fcebfbfb0b92ff9e75a063484 diff --git a/trunk/drivers/video/vga16fb.c b/trunk/drivers/video/vga16fb.c index 305c975b1787..0267acd8dc83 100644 --- a/trunk/drivers/video/vga16fb.c +++ b/trunk/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);