diff --git a/[refs] b/[refs] index 03e86c22e4cd..8840f4efbd1e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c2d340a403f08e57fb76e738e691fe466a38a8c8 +refs/heads/master: df9306de45529f02d18a1a16b8685ef5c90f98f7 diff --git a/trunk/drivers/video/pm2fb.c b/trunk/drivers/video/pm2fb.c index 27f93aab6ddc..f4f8ce802d02 100644 --- a/trunk/drivers/video/pm2fb.c +++ b/trunk/drivers/video/pm2fb.c @@ -973,8 +973,8 @@ static int pm2fb_pan_display(struct fb_var_screeninfo *var, { struct pm2fb_par *p = info->par; u32 base; - u32 depth = (var->bits_per_pixel + 7) & ~7; - u32 xres = (var->xres + 31) & ~31; + u32 depth = (info->var.bits_per_pixel + 7) & ~7; + u32 xres = (info->var.xres + 31) & ~31; depth = (depth > 32) ? 32 : depth; base = to3264(var->yoffset * xres + var->xoffset, depth, 1);