Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 86800
b: refs/heads/master
c: 7e53370
h: refs/heads/master
v: v3
  • Loading branch information
Ville Syrjala authored and Linus Torvalds committed Mar 5, 2008
1 parent 7f4a75d commit f6ff125
Show file tree
Hide file tree
Showing 2 changed files with 5 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: 19d06eff4e0d77fc1a15c92f845f1916e2d10dd0
refs/heads/master: 7e533705bd973267c488f8c3a7c7246ecad3a414
6 changes: 4 additions & 2 deletions trunk/drivers/video/sm501fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -237,12 +237,14 @@ static int sm501fb_check_var(struct fb_var_screeninfo *var,

/* check we can fit these values into the registers */

if (var->hsync_len > 255 || var->vsync_len > 255)
if (var->hsync_len > 255 || var->vsync_len > 63)
return -EINVAL;

if ((var->xres + var->right_margin) >= 4096)
/* hdisplay end and hsync start */
if ((var->xres + var->right_margin) > 4096)
return -EINVAL;

/* vdisplay end and vsync start */
if ((var->yres + var->lower_margin) > 2048)
return -EINVAL;

Expand Down

0 comments on commit f6ff125

Please sign in to comment.