---

yaml --- r: 54943 b: refs/heads/master c: 4941cb7 h: refs/heads/master i: 54941: c5181cb 54939: a4b148c 54935: 52378e8 54927: 62ba6e2 54911: 938cea0 v: v3
git-mirror · May 8, 2007 · e22d4b7 · e22d4b7
1 parent 5a173df
commit e22d4b7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38b4982c6388ae9596f959e3d7fef91affbd181d
+refs/heads/master: 4941cb7a18fd84d4d8cd097d2beada3c79c8f781
diff --git a/trunk/drivers/video/fbmem.c b/trunk/drivers/video/fbmem.c
@@ -803,6 +803,8 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
 
 	if ((var->activate & FB_ACTIVATE_FORCE) ||
 	    memcmp(&info->var, var, sizeof(struct fb_var_screeninfo))) {
+		u32 activate = var->activate;
+
 		if (!info->fbops->fb_check_var) {
 			*var = info->var;
 			return 0;
@@ -831,7 +833,7 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
 
 			if (!err && (flags & FBINFO_MISC_USEREVENT)) {
 				struct fb_event event;
-				int evnt = (var->activate & FB_ACTIVATE_ALL) ?
+				int evnt = (activate & FB_ACTIVATE_ALL) ?
 					FB_EVENT_MODE_CHANGE_ALL :
 					FB_EVENT_MODE_CHANGE;