Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 836eeed6 authored by Denis Vlasenko's avatar Denis Vlasenko Committed by Linus Torvalds
Browse files

[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: default avatarLinux Torvalds <torvalds@osdl.org>
parent 1b75d8ba

drivers/video/i810/i810_main.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -1000,8 +1000,10 @@ static int i810_check_params(struct fb_var_screeninfo *var, 




	if (fb_validate_mode(var, info)) {

	if (fb_validate_mode(var, info)) {

		if (fb_get_mode(FB_MAXTIMINGS, 0, var, info)) {

		if (fb_get_mode(FB_MAXTIMINGS, 0, var, info)) {

			int default_sync = (hsync1-HFMIN)|(hsync2-HFMAX)

			int default_sync = (info->monspecs.hfmin-HFMIN)

					    |(vsync1-VFMIN)|(vsync2-VFMAX);

						|(info->monspecs.hfmax-HFMAX)

						|(info->monspecs.vfmin-VFMIN)

						|(info->monspecs.vfmax-VFMAX);

			printk("i810fb: invalid video mode%s\n",

			printk("i810fb: invalid video mode%s\n",

			    default_sync ? "" :

			    default_sync ? "" :

			    ". Specifying vsyncN/hsyncN parameters may help");

			    ". Specifying vsyncN/hsyncN parameters may help");