From: David Miller <davem@davemloft.net>
Date: Tue, 11 Jan 2011 23:53:38 +0000 (+0000)
Subject: arkfb: Don't clobber par->state.vgabase during open method.
X-Git-Tag: firefly_0821_release~7613^2~1826^2~32
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ec70a9435600a7b4c019671aa0b6e6644b60f0b2;p=firefly-linux-kernel-4.4.55.git

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>
---

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;