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

login
register
mail settings
Submitter David Miller
Date Jan. 11, 2011, 11:53 p.m.
Message ID <20110111.155353.123417336.davem@davemloft.net>
Download mbox | patch
Permalink /patch/78488/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

David Miller - Jan. 11, 2011, 11:53 p.m.
Signed-off-by: David S. Miller <davem@davemloft.net>
---
 drivers/video/s3fb.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

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;