From e22d4b7c7524ab59cb786389ac4f5c4d3aab8537 Mon Sep 17 00:00:00 2001
From: "Antonino A. Daplas" <adaplas@gmail.com>
Date: Tue, 8 May 2007 00:39:22 -0700
Subject: [PATCH] --- yaml --- r: 54943 b: refs/heads/master c:
 4941cb7a18fd84d4d8cd097d2beada3c79c8f781 h: refs/heads/master i:   54941:
 c5181cbe919a7b212a2a6108ca215cc714bd8e8b   54939:
 a4b148ced148e33e288b78d86cf231ab0bc39844   54935:
 52378e860f83d317eecac75d14ff19c845724914   54927:
 62ba6e2f191b67a0aadce4ece791fcb7aa7faf02   54911:
 938cea080277c5df1f0a26553e9fdbb20f354797 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/video/fbmem.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fc2b81248ef5..00abb618dc4a 100644
--- 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
index c4ce3e44327e..cd1407921af5 100644
--- 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;