summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Miller <davem@davemloft.net>2011-01-12 00:53:38 +0100
committerPaul Mundt <lethal@linux-sh.org>2011-03-22 07:47:38 +0100
commitec70a9435600a7b4c019671aa0b6e6644b60f0b2 (patch)
tree21028839fc8f982c1d5eb893d85209516f01296a
parentvt8623fb: Pass par->state.vgabase to vga_*() calls. (diff)
downloadlinux-ec70a9435600a7b4c019671aa0b6e6644b60f0b2.tar.xz
linux-ec70a9435600a7b4c019671aa0b6e6644b60f0b2.zip
arkfb: 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>
-rw-r--r--drivers/video/arkfb.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/arkfb.c b/drivers/video/arkfb.c
index 53c66e8dcb0b..1c69db310ed5 100644
--- a/drivers/video/arkfb.c
+++ b/drivers/video/arkfb.c
@@ -535,7 +535,10 @@ static int arkfb_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 = 0x60;
par->state.num_seq = 0x30;