Skip to content

Commit

Permalink
[PATCH] i810fb: fix __initdata access
Browse files Browse the repository at this point in the history
[hv]sync[12] are __initdata, causing mplayer to oops with the previous i810fb fix.

My fault, this fixes it. Sorry.

Signed-off-by: Linux Torvalds <torvalds@osdl.org>
  • Loading branch information
Denis Vlasenko authored and Linus Torvalds committed May 4, 2005
1 parent 1b75d8b commit 836eeed
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/video/i810/i810_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1000,8 +1000,10 @@ static int i810_check_params(struct fb_var_screeninfo *var,

if (fb_validate_mode(var, info)) {
if (fb_get_mode(FB_MAXTIMINGS, 0, var, info)) {
int default_sync = (hsync1-HFMIN)|(hsync2-HFMAX)
|(vsync1-VFMIN)|(vsync2-VFMAX);
int default_sync = (info->monspecs.hfmin-HFMIN)
|(info->monspecs.hfmax-HFMAX)
|(info->monspecs.vfmin-VFMIN)
|(info->monspecs.vfmax-VFMAX);
printk("i810fb: invalid video mode%s\n",
default_sync ? "" :
". Specifying vsyncN/hsyncN parameters may help");
Expand Down

0 comments on commit 836eeed

Please sign in to comment.