diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-08-20 21:40:00 -0700 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-08-20 21:40:00 -0700 |
| commit | 646352319b6cd369750a706706810d87f6b6efa7 (patch) | |
| tree | e7830e1276cbad7d29bf9471def4b8940592c3b7 /drivers/video/fbmem.c | |
| parent | d3485d37c0b3292aec0618b6663c57542df5da99 (diff) | |
| parent | f6fdd7d9c273bb2a20ab467cb57067494f932fa3 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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 d2e19f6dd72..4ff853fbe0b 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; |