diff options
author | David Miller <davem@davemloft.net> | 2011-01-11 18:53:38 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-03-22 02:47:38 -0400 |
commit | ec70a9435600a7b4c019671aa0b6e6644b60f0b2 (patch) | |
tree | 21028839fc8f982c1d5eb893d85209516f01296a /drivers/video/arkfb.c | |
parent | ed3eb4c803dec3cf2976701f0b5722f98e642855 (diff) |
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>
Diffstat (limited to 'drivers/video/arkfb.c')
-rw-r--r-- | drivers/video/arkfb.c | 3 |
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) | |||
535 | 535 | ||
536 | mutex_lock(&(par->open_lock)); | 536 | mutex_lock(&(par->open_lock)); |
537 | if (par->ref_count == 0) { | 537 | if (par->ref_count == 0) { |
538 | void __iomem *vgabase = par->state.vgabase; | ||
539 | |||
538 | memset(&(par->state), 0, sizeof(struct vgastate)); | 540 | memset(&(par->state), 0, sizeof(struct vgastate)); |
541 | par->state.vgabase = vgabase; | ||
539 | par->state.flags = VGA_SAVE_MODE | VGA_SAVE_FONTS | VGA_SAVE_CMAP; | 542 | par->state.flags = VGA_SAVE_MODE | VGA_SAVE_FONTS | VGA_SAVE_CMAP; |
540 | par->state.num_crtc = 0x60; | 543 | par->state.num_crtc = 0x60; |
541 | par->state.num_seq = 0x30; | 544 | par->state.num_seq = 0x30; |