s3fb: Don't clobber par->state.vgabase during open method.
authorDavid Miller <davem@davemloft.net>
Tue, 11 Jan 2011 23:53:53 +0000 (23:53 +0000)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 22 Mar 2011 06:47:43 +0000 (15:47 +0900)
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
drivers/video/s3fb.c

index 262490a74bb70a20381a20db45cd88038c32dd50..b2286f916b5dd446c2732ee59ab77c38db7961c7 100644 (file)
@@ -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;