Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 271197
b: refs/heads/master
c: d8344e0
h: refs/heads/master
i:
  271195: 0b5bdb1
v: v3
  • Loading branch information
Laurent Pinchart committed Aug 19, 2011
1 parent 69e172d commit 172a784
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 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: 465cb7e700e8564fd2d76d5c7f3703eb07659617
refs/heads/master: d8344e090c5adff3290925cbb040d20133b7f586
5 changes: 3 additions & 2 deletions trunk/drivers/video/g364fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,11 @@ int g364fb_cursor(struct fb_info *info, struct fb_cursor *cursor)
static int g364fb_pan_display(struct fb_var_screeninfo *var,
struct fb_info *info)
{
if (var->xoffset || var->yoffset + var->yres > var->yres_virtual)
if (var->xoffset ||
var->yoffset + info->var.yres > info->var.yres_virtual)
return -EINVAL;

*(unsigned int *) TOP_REG = var->yoffset * var->xres;
*(unsigned int *) TOP_REG = var->yoffset * info->var.xres;
return 0;
}

Expand Down

0 comments on commit 172a784

Please sign in to comment.