From: Denis Vlasenko <vda@ilport.com.ua>
Date: Wed, 4 May 2005 05:07:16 +0000 (+0300)
Subject: [PATCH] i810fb: fix __initdata access
X-Git-Tag: v2.6.12-rc4~117^2~7
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=836eeed6cea8ca8138e9deff7571857923541604;p=linux-2.6

[PATCH] i810fb: fix __initdata access

[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>
---

diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
index e04d3e8b25..a9a618f2aa 100644
--- a/drivers/video/i810/i810_main.c
+++ b/drivers/video/i810/i810_main.c
@@ -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");