Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 17638
b: refs/heads/master
c: 32cf8c1
h: refs/heads/master
v: v3
  • Loading branch information
Antonino A. Daplas authored and Linus Torvalds committed Jan 10, 2006
1 parent 6e79c90 commit ff0af45
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 21 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: 198a52a1c490be89a8d5d130eda972630919e0af
refs/heads/master: 32cf8c1e50ac9d49f348e886c6e664cdc37aaead
20 changes: 0 additions & 20 deletions trunk/drivers/video/savage/savagefb_driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -1382,28 +1382,8 @@ static int savagefb_pan_display (struct fb_var_screeninfo *var,
struct fb_info *info)
{
struct savagefb_par *par = info->par;
u_int y_bottom;

y_bottom = var->yoffset;

if (!(var->vmode & FB_VMODE_YWRAP))
y_bottom += var->yres;

if (var->xoffset > (var->xres_virtual - var->xres))
return -EINVAL;
if (y_bottom > info->var.yres_virtual)
return -EINVAL;

savagefb_update_start (par, var);

info->var.xoffset = var->xoffset;
info->var.yoffset = var->yoffset;

if (var->vmode & FB_VMODE_YWRAP)
info->var.vmode |= FB_VMODE_YWRAP;
else
info->var.vmode &= ~FB_VMODE_YWRAP;

return 0;
}

Expand Down

0 comments on commit ff0af45

Please sign in to comment.