diff options
| author | Denis Vlasenko <vda@ilport.com.ua> | 2005-05-04 01:07:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-04 10:50:15 -0400 |
| commit | 836eeed6cea8ca8138e9deff7571857923541604 (patch) | |
| tree | 4380f4a890c18485326f1458e0b0cbc226233d05 /drivers/video | |
| parent | 1b75d8ba5ea96e174dc2674e01d87ce0d382ee44 (diff) | |
[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>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/i810/i810_main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c index e04d3e8b2549..a9a618f2aa6a 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, | |||
| 1000 | 1000 | ||
| 1001 | if (fb_validate_mode(var, info)) { | 1001 | if (fb_validate_mode(var, info)) { |
| 1002 | if (fb_get_mode(FB_MAXTIMINGS, 0, var, info)) { | 1002 | if (fb_get_mode(FB_MAXTIMINGS, 0, var, info)) { |
| 1003 | int default_sync = (hsync1-HFMIN)|(hsync2-HFMAX) | 1003 | int default_sync = (info->monspecs.hfmin-HFMIN) |
| 1004 | |(vsync1-VFMIN)|(vsync2-VFMAX); | 1004 | |(info->monspecs.hfmax-HFMAX) |
| 1005 | |(info->monspecs.vfmin-VFMIN) | ||
| 1006 | |(info->monspecs.vfmax-VFMAX); | ||
| 1005 | printk("i810fb: invalid video mode%s\n", | 1007 | printk("i810fb: invalid video mode%s\n", |
| 1006 | default_sync ? "" : | 1008 | default_sync ? "" : |
| 1007 | ". Specifying vsyncN/hsyncN parameters may help"); | 1009 | ". Specifying vsyncN/hsyncN parameters may help"); |