From: David Miller <davem@davemloft.net>
Date: Tue, 11 Jan 2011 23:53:53 +0000 (+0000)
Subject: s3fb: Don't clobber par->state.vgabase during open method.
X-Git-Tag: v2.6.39-rc1~98^2~31
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3ff259f2ed21e4438dc7937348710397e5ebd71e;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

s3fb: Don't clobber par->state.vgabase during open method.

Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

diff --git a/drivers/video/s3fb.c b/drivers/video/s3fb.c
index 262490a..b2286f9 100644
--- a/drivers/video/s3fb.c
+++ b/drivers/video/s3fb.c
@@ -379,7 +379,10 @@ static int s3fb_open(struct fb_info *info, int user)
 
 	mutex_lock(&(par->open_lock));
 	if (par->ref_count == 0) {
+		void __iomem *vgabase = par->state.vgabase;
+
 		memset(&(par->state), 0, sizeof(struct vgastate));
+		par->state.vgabase = vgabase;
 		par->state.flags = VGA_SAVE_MODE | VGA_SAVE_FONTS | VGA_SAVE_CMAP;
 		par->state.num_crtc = 0x70;
 		par->state.num_seq = 0x20;