diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-15 20:02:50 (GMT) |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-15 20:02:50 (GMT) |
| commit | fb80cbee4c4bfeaeb2ff6611beecfb9a2443da90 (patch) | |
| tree | 6e412d032cca4ddb50b8628b4bbecea120d316a7 /drivers/video/fbmem.c | |
| parent | b857c730d4e960d1876ff56ce5c4bd81ea9ff5ae (diff) | |
| parent | 3edea4833a1efcd43e1dff082bc8001fdfe74b34 (diff) | |
| download | linux-fb80cbee4c4bfeaeb2ff6611beecfb9a2443da90.tar.xz | |
Merge ../from-linus
Diffstat (limited to 'drivers/video/fbmem.c')
| -rw-r--r-- | drivers/video/fbmem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c index d2e19f6..4ff853f 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c @@ -628,7 +628,7 @@ fb_pan_display(struct fb_info *info, struct fb_var_screeninfo *var) int fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var) { - int err; + int err, flags = info->flags; if (var->activate & FB_ACTIVATE_INV_MODE) { struct fb_videomode mode1, mode2; @@ -682,7 +682,7 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var) !list_empty(&info->modelist)) err = fb_add_videomode(&mode, &info->modelist); - if (!err && info->flags & FBINFO_MISC_USEREVENT) { + if (!err && (flags & FBINFO_MISC_USEREVENT)) { struct fb_event event; info->flags &= ~FBINFO_MISC_USEREVENT; |