diff options
| author | David Miller <davem@davemloft.net> | 2011-01-11 23:53:53 +0000 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-03-22 15:47:43 +0900 |
| commit | 3ff259f2ed21e4438dc7937348710397e5ebd71e (patch) | |
| tree | 1e3dbbcc9b2b2dc53aad0aff37022d446fa3fde6 /drivers/video | |
| parent | ec70a9435600a7b4c019671aa0b6e6644b60f0b2 (diff) | |
| download | linux-3.10-3ff259f2ed21e4438dc7937348710397e5ebd71e.tar.gz linux-3.10-3ff259f2ed21e4438dc7937348710397e5ebd71e.tar.bz2 linux-3.10-3ff259f2ed21e4438dc7937348710397e5ebd71e.zip | |
s3fb: 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')
| -rw-r--r-- | drivers/video/s3fb.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/s3fb.c b/drivers/video/s3fb.c index 262490a74bb..b2286f916b5 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; |