Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 105543
b: refs/heads/master
c: 7572a1e
h: refs/heads/master
i:
  105541: 619b4ed
  105539: ab39e7c
  105535: 16a3840
v: v3
  • Loading branch information
Ville Syrjala authored and Linus Torvalds committed Jul 24, 2008
1 parent 2e1d478 commit ba8f661
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 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: 43a3abc6aca8505e708508e2c7c2f99a7f8f820b
refs/heads/master: 7572a1ea034a8fc45e57de28cc7573264975532a
9 changes: 4 additions & 5 deletions trunk/drivers/video/fbmem.c
Original file line number Diff line number Diff line change
Expand Up @@ -848,9 +848,8 @@ int
fb_pan_display(struct fb_info *info, struct fb_var_screeninfo *var)
{
struct fb_fix_screeninfo *fix = &info->fix;
int xoffset = var->xoffset;
int yoffset = var->yoffset;
int err = 0, yres = info->var.yres;
unsigned int yres = info->var.yres;
int err = 0;

if (var->yoffset > 0) {
if (var->vmode & FB_VMODE_YWRAP) {
Expand All @@ -866,8 +865,8 @@ fb_pan_display(struct fb_info *info, struct fb_var_screeninfo *var)
(var->xoffset % fix->xpanstep)))
err = -EINVAL;

if (err || !info->fbops->fb_pan_display || xoffset < 0 ||
yoffset < 0 || var->yoffset + yres > info->var.yres_virtual ||
if (err || !info->fbops->fb_pan_display ||
var->yoffset + yres > info->var.yres_virtual ||
var->xoffset + info->var.xres > info->var.xres_virtual)
return -EINVAL;

Expand Down

0 comments on commit ba8f661

Please sign in to comment.