[18/22] s3fb: Don't clobber par->state.vgabase during open method.

Commit Message

David Miller Jan. 11, 2011, 11:53 p.m. UTC

None

Patch

diff --git a/drivers/video/s3fb.c b/drivers/video/s3fb.c
index 2d436ec..45e1d43 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;