[PATCH] i810fb: fix __initdata access
authorDenis Vlasenko <vda@ilport.com.ua>
Wed, 4 May 2005 05:07:16 +0000 (08:07 +0300)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 4 May 2005 14:50:15 +0000 (07:50 -0700)
[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>
drivers/video/i810/i810_main.c

index e04d3e8b254967084683b949d2bf1abbac2492db..a9a618f2aa6a25316522c16f8649d13ba52eec34 100644 (file)
@@ -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");