From 3ff259f2ed21e4438dc7937348710397e5ebd71e Mon Sep 17 00:00:00 2001
From: David Miller <davem@davemloft.net>
Date: Tue, 11 Jan 2011 23:53:53 +0000
Subject: 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>
---
 drivers/video/s3fb.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'drivers/video/s3fb.c')

diff --git a/drivers/video/s3fb.c b/drivers/video/s3fb.c
index 262490a74bb7..b2286f916b5d 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;
-- 
cgit v1.2.1