Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 17641
b: refs/heads/master
c: c49a2bf
h: refs/heads/master
i:
  17639: c4d0115
v: v3
  • Loading branch information
Antonino A. Daplas authored and Linus Torvalds committed Jan 10, 2006
1 parent 72ac7c6 commit 93284f4
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e53f87a02a0d77c519fb93c7aa0912956294050c
refs/heads/master: c49a2bf7993c38b452017e729646e86815b7a51d
8 changes: 0 additions & 8 deletions trunk/drivers/video/vga16fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -705,15 +705,7 @@ static int vga16fb_setcolreg(unsigned regno, unsigned red, unsigned green,
static int vga16fb_pan_display(struct fb_var_screeninfo *var,
struct fb_info *info)
{
if (var->xoffset + info->var.xres > info->var.xres_virtual ||
var->yoffset + info->var.yres > info->var.yres_virtual)
return -EINVAL;

vga16fb_pan_var(info, var);

info->var.xoffset = var->xoffset;
info->var.yoffset = var->yoffset;
info->var.vmode &= ~FB_VMODE_YWRAP;
return 0;
}

Expand Down

0 comments on commit 93284f4

Please sign in to comment.