From 12fd579efbff4a85e44dec353081367e072850c6 Mon Sep 17 00:00:00 2001 From: "Antonino A. Daplas" Date: Mon, 15 Aug 2005 21:29:11 +0800 Subject: [PATCH] --- yaml --- r: 5797 b: refs/heads/master c: 3edea4833a1efcd43e1dff082bc8001fdfe74b34 h: refs/heads/master i: 5795: a35e60a7a2389f30e1b7525c1fe08a44fd05716c v: v3 --- [refs] | 2 +- trunk/drivers/video/fbmem.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d6d24772dab4..5f92ebccbbbd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6bd49341f2806168c877e12cefca77b93437bac2 +refs/heads/master: 3edea4833a1efcd43e1dff082bc8001fdfe74b34 diff --git a/trunk/drivers/video/fbmem.c b/trunk/drivers/video/fbmem.c index d2e19f6dd72c..4ff853fbe0be 100644 --- a/trunk/drivers/video/fbmem.c +++ b/trunk/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;